Skip to content

Commit 7c3d64d

Browse files
committed
Merge branch 'develop' into feature/RestApiv2
# Conflicts: # cmake_windows.cmd # sources/external-libs/SQLite/CMakeLists.txt # sources/external-libs/SQLite/sqlite-amalgamation-3270100/sqlite3.c # sources/external-libs/SQLite/sqlite-amalgamation-3270100/sqlite3.h # sources/external-libs/SQLite/sqlite-amalgamation-3270100/sqlite3ext.h # sources/external-libs/SQLite/sqlite-amalgamation-3460000/sqlite3.c # sources/external-libs/SQLite/sqlite-amalgamation-3460000/sqlite3.h # sources/external-libs/SQLite/sqlite-amalgamation-3460000/sqlite3ext.h # sources/external-libs/SQLite/sqlite-amalgamation-3510200/sqlite3.c # sources/external-libs/SQLite/sqlite-amalgamation-3510200/sqlite3.h # sources/external-libs/SQLite/sqlite-amalgamation-3510200/sqlite3ext.h # sources/external-libs/curlpp/CMakeLists.txt # sources/plugin_cpp_api/ApiImplementation.cpp # sources/plugins/dev-FakePlugin/FakePlugin.cpp # sources/server/RunningInformation.cpp # sources/server/automation/RuleManager.cpp # sources/server/automation/interpreter/Instance.cpp # sources/server/automation/interpreter/IpcAdapter.cpp # sources/server/database/common/Query.cpp # sources/server/database/common/Query.h # sources/server/database/common/QuerySpecializations.h # sources/server/database/common/requesters/Acquisition.cpp # sources/server/database/common/requesters/Configuration.cpp # sources/server/database/common/requesters/Device.cpp # sources/server/database/common/requesters/Keyword.cpp # sources/server/database/common/requesters/Plugin.cpp # sources/server/database/common/requesters/Recipient.cpp # sources/server/database/common/requesters/Rule.cpp # sources/server/pluginSystem/Information.cpp # sources/server/pluginSystem/InstanceStateHandler.cpp # sources/server/pluginSystem/IpcAdapter.cpp # sources/server/pluginSystem/IpcAdapter.h # sources/server/pluginSystem/Manager.cpp # sources/server/startupOptions/IStartupOptions.h # sources/server/startupOptions/StartupOptions.cpp # sources/server/startupOptions/StartupOptions.h # sources/server/task/Scheduler.cpp # sources/server/task/backup/Backup.cpp # sources/server/update/UpdateManager.h # sources/server/web/poco/RestDispatcher.cpp # sources/server/web/poco/RestRequestHandler.cpp # sources/server/web/poco/RestRequestHandler.h # sources/server/web/poco/WebsiteRequestHandler.cpp # sources/server/web/rest/service/Configuration.cpp # sources/server/web/rest/service/System.cpp # sources/shared/shared/DataContainer.cpp # sources/shared/shared/StringExtension.h # sources/shared/shared/http/FileDownloader.cpp # sources/shared/shared/http/curlppHelpers.cpp # sources/shared/shared/http/curlppHttpRestRequest.cpp # sources/shared/shared/plugin/yPluginApi/IDeviceCommand.h
2 parents 9da2cab + 7551781 commit 7c3d64d

198 files changed

Lines changed: 42949 additions & 29922 deletions

File tree

Some content is hidden

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

.github/workflows/generate_binaries.yml

Lines changed: 153 additions & 264 deletions
Large diffs are not rendered by default.

.github/workflows/unit_tests.yml

Lines changed: 51 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,76 @@
11
name: Unit tests
22

3-
on: push
3+
on:
4+
push:
5+
workflow_dispatch:
6+
7+
permissions:
8+
contents: write
9+
packages: read
410

511
jobs:
612
linux:
713
name : Unit tests for Linux
814
runs-on: ubuntu-latest
915
steps:
1016
- name: Checkout code
11-
uses: actions/checkout@v2
17+
uses: actions/checkout@v4
18+
19+
- name: Login to GitHub Container Repository (GHCR)
20+
uses: docker/login-action@v3
21+
with:
22+
registry: ghcr.io
23+
username: ${{ github.actor }}
24+
password: ${{ secrets.GITHUB_TOKEN }}
25+
1226
- name: Generate unittests binary
13-
uses: Yadoms/build-yadoms-action@v4.0.1
1427
id: yadoms_build_step
28+
uses: Yadoms/build-yadoms-action@v4.0.2
1529
with:
16-
buildImage: ghcr.io/yadoms/build_for_linux:latest
1730
registry: ghcr.io
18-
username: ${{ secrets.CONTAINER_GH_LOGIN }}
19-
password: ${{ secrets.CONTAINER_GH_TOKEN }}
31+
username: ${{ github.actor }}
32+
password: ${{ secrets.GITHUB_TOKEN }}
33+
# TODO buildImage: ghcr.io/yadoms/build_for_linux:latest
34+
buildImage: ghcr.io/yadoms/build_for_linux:feature-updateRPiBuild_notSureBestMethod
35+
privileged: ${{ matrix.target.privileged }}
2036
entrypoint: 'sh /work/build-scripts/linux/entrypoint_docker_unittests.sh'
37+
2138
- name: Archive unittests artifacts
22-
uses: actions/upload-artifact@v4.4.0
39+
uses: actions/upload-artifact@v4
2340
with:
2441
name: Linux-UnitTests
2542
path: ./tests/unit/builds
43+
2644
- name: Run unit tests
2745
run: |
2846
echo "Running unittests for yadoms ${{ steps.yadoms_build_step.outputs.yadomsVersion }}"
2947
cd tests/unit/builds
3048
./yadomsTests -l test_suite
3149
32-
Windows:
33-
name : Run Unit tests for Windows
34-
runs-on: windows-latest
35-
steps:
36-
- name: Checkout code
37-
uses: actions/checkout@v2
38-
- name: Yadoms build script
39-
uses: Yadoms/build-yadoms-windows-action@v2.0.1
40-
id: yadoms_build_step
41-
with:
42-
buildImage: ghcr.io/yadoms/build_for_windows:latest
43-
registry: ghcr.io
44-
username: ${{ secrets.CONTAINER_GH_LOGIN }}
45-
password: ${{ secrets.CONTAINER_GH_TOKEN }}
46-
entrypoint: 'powershell.exe -Command C:\work\build-scripts\windows\entrypoint_docker_unittests.ps1'
47-
- name: Archive unittests artifacts
48-
uses: actions/upload-artifact@v4.4.0
49-
with:
50-
name: Windows-UnitTests
51-
path: ./tests/unit/builds
52-
- name: Run Unit tests for Windows
53-
shell: cmd
54-
run: |
55-
cd tests/unit/builds/RELEASE
56-
yadomsTests.exe -l test_suite -t !TestLoader # Disable TestLoader tests because of bad memory handling using Poco (random crashes). Need to rewrite startupOptions::CStartupOptions
50+
# TODO à remettre
51+
# Windows:
52+
# name : Run Unit tests for Windows
53+
# runs-on: windows-latest
54+
# steps:
55+
# - name: Checkout code
56+
# uses: actions/checkout@v2
57+
# - name: Yadoms build script
58+
# uses: Yadoms/build-yadoms-windows-action@v2.0.1
59+
# id: yadoms_build_step
60+
# with:
61+
# buildImage: ghcr.io/yadoms/build_for_windows:latest
62+
# registry: ghcr.io
63+
# username: ${{ secrets.CONTAINER_GH_LOGIN }}
64+
# password: ${{ secrets.CONTAINER_GH_TOKEN }}
65+
# entrypoint: 'powershell.exe -Command C:\work\build-scripts\windows\entrypoint_docker_unittests.ps1'
66+
# - name: Archive unittests artifacts
67+
# uses: actions/upload-artifact@v4.4.0
68+
# with:
69+
# name: Windows-UnitTests
70+
# path: ./tests/unit/builds
71+
# - name: Run Unit tests for Windows
72+
# shell: cmd
73+
# run: |
74+
# cd tests/unit/builds/RELEASE
75+
# yadomsTests.exe -l test_suite -t !TestLoader # Disable TestLoader tests because of bad memory handling using Poco (random crashes). Need to rewrite startupOptions::CStartupOptions
5776

.gitignore

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,10 @@ sources/www/.vs
4444
/tests/user/report/
4545
/tests/user/report_html
4646
/tests/user/report_xml
47-
/projects/Yadoms.DotSettings
47+
/projects*
4848

4949
/sources/external-libs/curl/build/
50+
*.Identifier
51+
/builds/
52+
/bin*/
53+
/tests/unit/projects/

builds/.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

cmake_linux.sh

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

cmake_macosx.sh

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

cmake_raspberry.sh

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

cmake_synology218p.sh

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

0 commit comments

Comments
 (0)