Skip to content

Commit e945624

Browse files
faustbrianfaustbrian
authored
release: v1.3.0 (#142)
2 parents a188803 + 66c2bbe commit e945624

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

93 files changed

+4064
-3916
lines changed

‎.appveyor‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
version: 1.0.{build}
2+
3+
image: Visual Studio 2017
4+
5+
environment:
6+
matrix:
7+
- CONFIGURATION: Debug
8+
- CONFIGURATION: Release
9+
10+
before_build:
11+
- cmake -D UNIT_TEST=ON -G "Visual Studio 15 2017 Win64" .
12+
13+
build:
14+
project: $(APPVEYOR_BUILD_FOLDER)\ark_cpp_client.sln
15+
16+
test_script:
17+
- cmd: '%APPVEYOR_BUILD_FOLDER%\Bin\%CONFIGURATION%\ark_cpp_client.exe'

‎.appveyor.yml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
version: 1.0.{build}
2+
3+
image: Visual Studio 2017
4+
5+
environment:
6+
matrix:
7+
- CONFIGURATION: Debug
8+
- CONFIGURATION: Release
9+
10+
before_build:
11+
- cmake -D UNIT_TEST=ON -G "Visual Studio 15 2017 Win64" .
12+
13+
build:
14+
project: $(APPVEYOR_BUILD_FOLDER)\ark_cpp_client.sln
15+
16+
test_script:
17+
- cmd: '%APPVEYOR_BUILD_FOLDER%\test\%CONFIGURATION%\ark_cpp_client_tests.exe'

‎.codacy.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
exclude_paths:
3+
- '*.sh'
4+
- '*.md'

‎.github/workflows/test.yml‎

Lines changed: 42 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -3,50 +3,55 @@ name: Test
33
on:
44
push:
55
branches:
6-
- "**"
6+
- "*"
7+
- "*/*"
78
pull_request:
8-
types: [opened]
9+
types: [ready_for_review, synchronize, opened]
910

1011
jobs:
11-
arduino-default:
12+
arduino:
1213
runs-on: ubuntu-latest
1314

1415
steps:
1516
- uses: actions/checkout@v1
1617
- name: Make scripts executable
1718
run: sudo chmod -R +x ./.github/workflows/test/*.sh
18-
- name: Install
19+
- name: Install Dependencies
1920
run: ./.github/workflows/test/install_arduino.sh
20-
- name: Build
21+
- name: Build Arduino Sketch
2122
run: ./.github/workflows/test/script_arduino.sh
2223

23-
linux-default:
24+
platformio:
2425
runs-on: ubuntu-latest
2526

2627
steps:
2728
- uses: actions/checkout@v1
28-
- name: Make scripts executable
29-
run: sudo chmod -R +x ./.github/workflows/test/*.sh
30-
- name: Install
31-
run: ./.github/workflows/test/install_platform_io.sh
29+
- name: Install Dependencies
30+
run: |
31+
sudo pip install -U platformio
32+
platformio update
3233
- name: Build
33-
run: ./.github/workflows/test/script_platform_io.sh
34+
run: |
35+
platformio run
36+
platformio run -d ./test
37+
3438
linux-gcc7:
3539
runs-on: ubuntu-latest
3640

3741
steps:
3842
- uses: actions/checkout@v1
39-
- name: Install dependencies
43+
- name: Install Dependencies
4044
run: |
41-
sudo apt-add-repository -y ppa:ubuntu-toolchain-r/test
42-
sudo apt-get update
43-
sudo apt-get -y install g++-7 lcov cmake openssl
44-
- name: Make scripts executable
45-
run: sudo chmod -R +x ./.github/workflows/test/*.sh
46-
- name: Environment variables
47-
run: CC=gcc-7 && CXX=g++-7
45+
sudo apt-add-repository -y ppa:ubuntu-toolchain-r/test
46+
sudo apt-get update
47+
sudo apt-get -y install g++-7 lcov cmake openssl
4848
- name: Build
49-
run: ./.github/workflows/test/script_desktop.sh
49+
run: |
50+
mkdir build && cd build
51+
cmake -DCMAKE_BUILD_TYPE=Coverage -DUNIT_TEST=ON ..
52+
cmake --build .
53+
- name: Run Tests
54+
run: ./build/test/ark_cpp_client_tests
5055
- name: Codecov upload
5156
run: bash <(curl -s https://codecov.io/bash) -t ${{ secrets.CODECOV_TOKEN }}
5257

@@ -55,16 +60,19 @@ jobs:
5560

5661
steps:
5762
- uses: actions/checkout@v1
58-
- name: Install dependencies
63+
- name: Install Dependencies
5964
run: |
60-
sudo apt-get update
61-
sudo apt-get -y install clang-5.0 clang-format-5.0 clang-tidy-5.0 lcov cmake openssl
65+
sudo apt-get update
66+
sudo apt-get -y install clang-5.0 clang-format-5.0 clang-tidy-5.0 lcov cmake openssl
6267
- name: Make scripts executable
6368
run: sudo chmod -R +x ./.github/workflows/test/*.sh
64-
- name: Environment variables
65-
run: CC=clang-5.0 && CXX=clang++-5.0
6669
- name: Build
67-
run: ./.github/workflows/test/script_desktop.sh
70+
run: |
71+
mkdir build && cd build
72+
cmake -DUNIT_TEST=ON ..
73+
cmake --build .
74+
- name: Run Tests
75+
run: ./build/test/ark_cpp_client_tests
6876
- name: Clang Tidy
6977
run: ./.github/workflows/test/clang_tidy.sh
7078
- name: Clang Format
@@ -76,9 +84,12 @@ jobs:
7684
steps:
7785
- uses: actions/checkout@v1
7886
- run: COMPILER=clang++
79-
- name: Install dependencies
80-
run: brew install cmake lcov
81-
- name: Make scripts executable
82-
run: sudo chmod -R +x ./.github/workflows/test/*.sh
87+
- name: Install Dependencies
88+
run: brew install cmake
8389
- name: Build
84-
run: ./.github/workflows/test/script_desktop.sh
90+
run: |
91+
mkdir build && cd build
92+
cmake -DUNIT_TEST=ON ..
93+
cmake --build .
94+
- name: Run Tests
95+
run: ./build/test/ark_cpp_client_tests

‎.github/workflows/test/clang_format.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash -ex
22

3-
grep -nr '\s$' src test examples .gitignore .gitmodules 2>&1 > /dev/null
3+
grep -nr '\s$' src test .gitignore 2>&1 > /dev/null
44
if $?; then
55
echo Trailing whitespace found, aborting
66
exit 1

‎.github/workflows/test/clang_tidy.sh‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1+
#!/bin/bash
2+
13
# run clang tidy
2-
cmake -DENABLE_CLANG_TIDY=ON .
4+
cmake -DENABLE_CLANG_TIDY=ON -DUNIT_TEST=ON .
35
make tidy > output.txt
46
#if [[ -n $(grep "warning: " output.txt) ]] || [[ -n $(grep "error: " output.txt) ]]; then
57
# for now only fail the test on errors. Change this as project matures

‎.github/workflows/test/script_arduino.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
bash ./extras/ARDUINO_IDE.sh --auto
44

55
mkdir -p ~/Arduino/libraries/cpp-client/
6-
mv ~/project/* ~/Arduino/libraries/cpp-client
6+
mv ${GITHUB_WORKSPACE}/* ~/Arduino/libraries/cpp-client
77

88
arduino-cli compile --output temp.bin -b esp32:esp32:esp32 ~/Arduino/libraries/cpp-client/examples/arduino/ESP32/ESP32.ino --debug

‎.gitignore‎

Lines changed: 12 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11

22
/.history
33
/.vs
4-
/.vscode
54
/bin
5+
build
66
/lib
77
/_Base
88
/CMakeFiles
@@ -23,62 +23,40 @@
2323
/test/.vscode
2424
/test/lib/readme.txt
2525
.DS_Store
26-
/src/Ark-Cpp-Client-lib.dir
27-
/src/CMakeFiles
28-
/src/cmake_install.cmake
29-
/src/Ark-Cpp-Client-lib.vcxproj.filters
30-
/src/Ark-Cpp-Client-lib.vcxproj
31-
/src/Ark-Cpp-Client-lib.sln
26+
/src/ark_cpp_client.vcxproj.filters
27+
/src/ark_cpp_client.vcxproj
28+
/src/ark_cpp_client.sln
3229
/src/ALL_BUILD.vcxproj.filters
3330
/src/ALL_BUILD.vcxproj
34-
/test/Ark-Cpp-Client-tests.dir
3531
/Win32
3632
/test/NightlyMemoryCheck.vcxproj.filters
3733
/test/NightlyMemoryCheck.vcxproj
3834
/test/Nightly.vcxproj.filters
3935
/test/Nightly.vcxproj
4036
/test/Experimental.vcxproj.filters
4137
/test/Experimental.vcxproj
42-
/test/DartConfiguration.tcl
43-
/test/CTestTestfile.cmake
4438
/test/Continuous.vcxproj.filters
4539
/test/Continuous.vcxproj
46-
/test/cmake_install.cmake
47-
/test/CMakeFiles/generate.stamp.depend
48-
/test/CMakeFiles/generate.stamp
49-
/test/CMakeFiles
50-
/test/Ark-Cpp-Client-tests.vcxproj.filters
51-
/test/Ark-Cpp-Client-tests.vcxproj
52-
/test/Ark-Cpp-Client-tests.sln
40+
/test/ark_cpp_client_tests.vcxproj.filters
41+
/test/ark_cpp_client_tests.vcxproj
42+
/test/Aark_cpp_client_tests.sln
5343
/test/ALL_BUILD.vcxproj.filters
5444
/test/ALL_BUILD.vcxproj
5545
/_3rdParty
5646
/ZERO_CHECK.vcxproj.filters
5747
/ZERO_CHECK.vcxproj
58-
/cmake_install.cmake
59-
/CMakeCache.txt
60-
/Ark-Cpp-Client.sln
48+
/ark_cpp_client.sln
6149
/ALL_BUILD.vcxproj.filters
6250
/ALL_BUILD.vcxproj
6351
/src/Win32
64-
/test/Debug
65-
/src/Debug
66-
/test/Release
67-
/src/Release
68-
/examples/cmake_example/CMakeFiles
69-
/examples/cmake_example/CMakeCache.txt
70-
/examples/cmake_example/Win32/
7152
/examples/cmake_example/_3rdParty
72-
/examples/cmake_example/lib/Debug
7353
/examples/cmake_example/bin
74-
/examples/cmake_example/Cpp-Client-Example.dir
7554
/examples/cmake_example/ZERO_CHECK.vcxproj.filters
7655
/examples/cmake_example/ZERO_CHECK.vcxproj
77-
/examples/cmake_example/Cpp-Client-Example.vcxproj.filters
78-
/examples/cmake_example/Cpp-Client-Example.vcxproj
79-
/examples/cmake_example/Cpp-Client-Example.sln
80-
/examples/cmake_example/cmake_install.cmake
56+
/examples/cmake_example/ark_cpp_client_example.vcxproj.filters
57+
/examples/cmake_example/ark_cpp_client_example.vcxproj
58+
/examples/cmake_example/ark_cpp_client_example.sln
8159
/examples/cmake_example/ALL_BUILD.vcxproj.filters
8260
/examples/cmake_example/ALL_BUILD.vcxproj
8361
/examples/cmake_example/Win32
84-
/examples/cmake_example/Debug
62+
compile_commands.json

‎.gitmodules‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎.vscode/settings.json‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
{
2+
"editor.tokenColorCustomizations": {
3+
"textMateRules": [
4+
{
5+
"scope": "googletest.failed",
6+
"settings": {
7+
"foreground": "#f00"
8+
}
9+
},
10+
{
11+
"scope": "googletest.passed",
12+
"settings": {
13+
"foreground": "#0f0"
14+
}
15+
},
16+
{
17+
"scope": "googletest.run",
18+
"settings": {
19+
"foreground": "#0f0"
20+
}
21+
}
22+
]
23+
},
24+
"gtest-adapter.debugConfig": [
25+
"Debug Tests"
26+
],
27+
"gtest-adapter.supportLocation": true
28+
}

0 commit comments

Comments
 (0)