Skip to content

Commit 1fd8227

Browse files
sgallousgallou
committed
Merge branch 'master' into develop
2 parents 7551781 + af7d244 commit 1fd8227

20 files changed

Lines changed: 2661 additions & 2768 deletions

‎.github/workflows/generate_binaries.yml‎

Lines changed: 77 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
password: ${{ secrets.GITHUB_TOKEN }}
4040

4141
- name: Yadoms build script
42-
uses: Yadoms/build-yadoms-action@v4.0.2
42+
uses: Yadoms/build-yadoms-action@v4.0.3-beta.2
4343
with:
4444
registry: ghcr.io
4545
username: ${{ github.actor }}
@@ -65,89 +65,89 @@ jobs:
6565
docker logout ghcr.io || true
6666
rm -f ~/.docker/config.json
6767
68-
build-windows:
69-
name: Build (Windows)
70-
runs-on: windows-latest
71-
steps:
72-
- name: Checkout code
73-
uses: actions/checkout@v4
74-
75-
- name: Login to GitHub Container Repository (GHCR)
76-
uses: docker/login-action@v3
77-
with:
78-
registry: ghcr.io
79-
username: ${{ github.actor }}
80-
password: ${{ secrets.GITHUB_TOKEN }}
81-
82-
- name: Yadoms build script
83-
uses: Yadoms/build-yadoms-windows-action@v2.0.2
84-
with:
85-
registry: ghcr.io
86-
username: ${{ github.actor }}
87-
password: ${{ secrets.GITHUB_TOKEN }}
88-
buildImage: ghcr.io/yadoms/build_for_windows:latest
89-
entrypoint: "powershell.exe -Command C:\\work\\build-scripts\\windows\\entrypoint_docker.ps1" #TODO utile ?
90-
91-
- name: Archive binaries
92-
uses: actions/upload-artifact@v4
93-
with:
94-
name: Windows-Binaries
95-
path: ./bin-windows/package/Yadoms*
96-
97-
- name: Archive update packages
98-
uses: actions/upload-artifact@v4
99-
with:
100-
name: Windows-Update
101-
path: ./bin-windows/package/update*
102-
103-
- name: Cleanup Docker credentials
104-
if: always()
105-
shell: powershell
106-
run: |
107-
docker logout ghcr.io 2>$null
108-
Remove-Item "$env:USERPROFILE\.docker\config.json" -Force -ErrorAction SilentlyContinue
109-
110-
rpi-image:
111-
name: RaspberryPI image - ${{ matrix.language.label }}
112-
runs-on: ubuntu-latest
113-
needs: build-linux
114-
strategy:
115-
fail-fast: false
116-
matrix:
117-
language:
118-
- lang: fr
119-
label: FR
120-
- lang: en
121-
label: EN
122-
123-
steps:
124-
- name: Download RaspberryPI binaries
125-
uses: actions/download-artifact@v4
126-
with:
127-
name: RaspberryPI-Binaries
128-
path: ./
129-
130-
- name: Build RaspberryPI image (${{ matrix.language.label }})
131-
uses: Yadoms/build-yadoms-rpiimage-action@v1.0.1
132-
with:
133-
output_folder: $GITHUB_WORKSPACE/bin-RaspberryPI/pi_image
134-
language: ${{ matrix.language.lang }}
135-
branch_or_tag_name: 2020-12-02-raspbian-buster
136-
137-
- name: Archive RPi image (${{ matrix.language.label }})
138-
uses: actions/upload-artifact@v4
139-
with:
140-
name: Raspbian-Lite-${{ matrix.language.label }}-Yadoms-Image
141-
path: ./bin-RaspberryPI/pi_image/*.zip
68+
# build-windows:
69+
# name: Build (Windows)
70+
# runs-on: windows-latest
71+
# steps:
72+
# - name: Checkout code
73+
# uses: actions/checkout@v4
74+
75+
# - name: Login to GitHub Container Repository (GHCR)
76+
# uses: docker/login-action@v3
77+
# with:
78+
# registry: ghcr.io
79+
# username: ${{ github.actor }}
80+
# password: ${{ secrets.GITHUB_TOKEN }}
81+
82+
# - name: Yadoms build script
83+
# uses: Yadoms/build-yadoms-windows-action@v2.0.2
84+
# with:
85+
# registry: ghcr.io
86+
# username: ${{ github.actor }}
87+
# password: ${{ secrets.GITHUB_TOKEN }}
88+
# buildImage: ghcr.io/yadoms/build_for_windows:latest
89+
# entrypoint: "powershell.exe -Command C:\\work\\build-scripts\\windows\\entrypoint_docker.ps1" #TODO utile ?
90+
91+
# - name: Archive binaries
92+
# uses: actions/upload-artifact@v4
93+
# with:
94+
# name: Windows-Binaries
95+
# path: ./bin-windows/package/Yadoms*
96+
97+
# - name: Archive update packages
98+
# uses: actions/upload-artifact@v4
99+
# with:
100+
# name: Windows-Update
101+
# path: ./bin-windows/package/update*
102+
103+
# - name: Cleanup Docker credentials
104+
# if: always()
105+
# shell: powershell
106+
# run: |
107+
# docker logout ghcr.io 2>$null
108+
# Remove-Item "$env:USERPROFILE\.docker\config.json" -Force -ErrorAction SilentlyContinue
109+
110+
# rpi-image:
111+
# name: RaspberryPI image - ${{ matrix.language.label }}
112+
# runs-on: ubuntu-latest
113+
# needs: build-linux
114+
# strategy:
115+
# fail-fast: false
116+
# matrix:
117+
# language:
118+
# - lang: fr
119+
# label: FR
120+
# - lang: en
121+
# label: EN
122+
123+
# steps:
124+
# - name: Download RaspberryPI binaries
125+
# uses: actions/download-artifact@v4
126+
# with:
127+
# name: RaspberryPI-Binaries
128+
# path: ./
129+
130+
# - name: Build RaspberryPI image (${{ matrix.language.label }})
131+
# uses: Yadoms/build-yadoms-rpiimage-action@v1.0.1
132+
# with:
133+
# output_folder: $GITHUB_WORKSPACE/bin-RaspberryPI/pi_image
134+
# language: ${{ matrix.language.lang }}
135+
# branch_or_tag_name: 2020-12-02-raspbian-buster
136+
137+
# - name: Archive RPi image (${{ matrix.language.label }})
138+
# uses: actions/upload-artifact@v4
139+
# with:
140+
# name: Raspbian-Lite-${{ matrix.language.label }}-Yadoms-Image
141+
# path: ./bin-RaspberryPI/pi_image/*.zip
142142

143143

144144
release:
145145
name: Create/Update Release (tag only)
146146
runs-on: ubuntu-latest
147147
needs:
148148
- build-linux
149-
- build-windows
150-
- rpi-image
149+
# - build-windows
150+
# - rpi-image
151151
if: github.ref_type == 'tag'
152152
steps:
153153
- name: Download all artifacts

‎.github/workflows/unit_tests.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@ jobs:
2525

2626
- name: Generate unittests binary
2727
id: yadoms_build_step
28-
uses: Yadoms/build-yadoms-action@v4.0.2
28+
uses: Yadoms/build-yadoms-action@v4.0.3-beta.2
2929
with:
3030
registry: ghcr.io
3131
username: ${{ github.actor }}
3232
password: ${{ secrets.GITHUB_TOKEN }}
3333
# TODO buildImage: ghcr.io/yadoms/build_for_linux:latest
3434
buildImage: ghcr.io/yadoms/build_for_linux:feature-updateRPiBuild_notSureBestMethod
3535
privileged: ${{ matrix.target.privileged }}
36-
entrypoint: 'sh /work/build-scripts/linux/entrypoint_docker_unittests.sh'
36+
entrypoint: '/entrypoint_tests.sh'
3737

3838
- name: Archive unittests artifacts
3939
uses: actions/upload-artifact@v4

‎build-scripts/linux/entrypoint_docker_unittests.sh‎

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

‎build-scripts/macos/entrypoint_docker_unittests.sh‎

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

‎build-scripts/windows/entrypoint_docker.ps1‎

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

‎build-scripts/windows/entrypoint_docker_unittests.ps1‎

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

‎sources/CMakeLists.txt‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ set(Boost_USE_STATIC_RUNTIME ON)
106106
add_definitions(-DBOOST_SPIRIT_THREADSAFE)
107107

108108
# define all needed boost libraries
109-
set(BOOST_LIBS
109+
set(BOOST_COMPONENTS
110110
atomic
111111
chrono
112112
date_time
@@ -117,8 +117,8 @@ set(BOOST_LIBS
117117
)
118118

119119
# search boost libs
120-
find_package(Boost 1.89.0 CONFIG REQUIRED COMPONENTS ${BOOST_LIBS})
121-
message("-- Found Boost: ${BOOST_LIBS}")
120+
find_package(Boost 1.89.0 CONFIG REQUIRED COMPONENTS ${BOOST_COMPONENTS})
121+
message("-- Found Boost ${Boost_VERSION_STRING} : ${BOOST_COMPONENTS}")
122122

123123

124124
## Thread Library
@@ -183,6 +183,7 @@ endif()
183183
SET(OPENSSL_USE_STATIC_LIBS TRUE)
184184
SET(OPENSSL_MSVC_STATIC_RT TRUE)
185185
FIND_PACKAGE(OpenSSL REQUIRED)
186+
message("-- Found OpenSSL ${OPENSSL_VERSION}")
186187
#Do not add OPENSSL_SSL_LIBRARY and OPENSSL_CRYPTO_LIBRARY here; it will be later
187188
#if done here, this is too early, and for gcc the libraries appears in bad order regarding Poco for example
188189

@@ -215,7 +216,7 @@ endif(MSVC)
215216
add_definitions(-DPOCO_EXTERNAL_OPENSSL=42) #force an unknown value (empty value do not work correctly)
216217

217218
find_package(Poco CONFIG REQUIRED COMPONENTS ${POCO_COMPONENTS})
218-
message("-- Found Poco: ${POCO_COMPONENTS}")
219+
message("-- Found Poco ${Poco_VERSION} : ${POCO_COMPONENTS}")
219220
set(Poco_TARGETS)
220221
foreach(c IN LISTS POCO_COMPONENTS)
221222
list(APPEND Poco_TARGETS Poco::${c})
@@ -239,7 +240,7 @@ if(PROTOBUF_ROOT)
239240
endif()
240241
set(Protobuf_USE_STATIC_LIBS ON)
241242
find_package(Protobuf MODULE 3.1.0 REQUIRED)
242-
message("-- Found Protobuf: ${Protobuf_VERSION}")
243+
message("-- Found Protobuf ${Protobuf_VERSION}")
243244

244245

245246
###############################################

‎sources/external-libs/curlpp/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ endif(CMAKE_TOOLCHAIN_FILE)
5959
ExternalProject_Add (curlpp_build
6060
DEPENDS curl_build
6161
GIT_REPOSITORY https://github.com/jpbarrette/curlpp.git
62-
GIT_TAG de69e17c10f481d8e60da30d47f902ca81e52341
62+
GIT_TAG ec1b66e699557cd9d608d322c013a1ebda16bd08
6363
GIT_CONFIG advice.detachedHead=false
6464
PATCH_COMMAND ${CURLPP_PATHCMD}
6565
PREFIX ${CURLPP_ROOT}

0 commit comments

Comments
 (0)