Skip to content

Commit fd50ef5

Browse files
committed
Update CMake configuration to set CLIENT_VERSION_IS_RELEASE to true in CI and adjust build flags in build.sh for Guix
1 parent b676fce commit fd50ef5

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

.github/workflows/ci-master.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373
run: |
7474
mkdir build
7575
export HOST_TRIPLET=$(depends/config.guess)
76-
cmake -DCMAKE_TOOLCHAIN_FILE=$(realpath depends/$HOST_TRIPLET/toolchain.cmake) -DBUILD_CLI=ON -DBUILD_TESTS=ON -DBUILD_GUI=ON -DCMAKE_BUILD_TYPE=Release -S$(realpath .) -B$(realpath build)
76+
cmake -DCMAKE_TOOLCHAIN_FILE=$(realpath depends/$HOST_TRIPLET/toolchain.cmake) -DBUILD_CLI=ON -DBUILD_TESTS=ON -DBUILD_GUI=ON -DCMAKE_BUILD_TYPE=Release -DCLIENT_VERSION_IS_RELEASE=true -S$(realpath .) -B$(realpath build)
7777
cd build && make -j$(nproc)
7878
- name: Run Unit Tests
7979
run: |
@@ -256,7 +256,7 @@ jobs:
256256
run: |
257257
mkdir build
258258
export HOST_TRIPLET=$(x86_64-w64-mingw32-gcc -dumpmachine)
259-
cmake -DCMAKE_TOOLCHAIN_FILE=$(realpath depends/$HOST_TRIPLET/toolchain.cmake) -DBUILD_CLI=ON -DBUILD_TESTS=OFF -DCMAKE_BUILD_TYPE=Release -DBUILD_GUI=ON -S$(realpath .) -B$(realpath build)
259+
cmake -DCMAKE_TOOLCHAIN_FILE=$(realpath depends/$HOST_TRIPLET/toolchain.cmake) -DBUILD_CLI=ON -DBUILD_TESTS=OFF -DCMAKE_BUILD_TYPE=Release -DBUILD_GUI=ON -DCLIENT_VERSION_IS_RELEASE=true -S$(realpath .) -B$(realpath build)
260260
cd build && make -j$(nproc)
261261
- name: Prepare Files for Artifact
262262
run: |
@@ -305,7 +305,7 @@ jobs:
305305
run: |
306306
mkdir build
307307
export HOST_TRIPLET=$(depends/config.guess)
308-
cmake -DCMAKE_TOOLCHAIN_FILE=$(pwd)/depends/$HOST_TRIPLET/toolchain.cmake -DBUILD_CLI=ON -DBUILD_TESTS=OFF -DBUILD_GUI=ON -DCMAKE_BUILD_TYPE=Release -S$(pwd) -B$(pwd)/build
308+
cmake -DCMAKE_TOOLCHAIN_FILE=$(pwd)/depends/$HOST_TRIPLET/toolchain.cmake -DBUILD_CLI=ON -DBUILD_TESTS=OFF -DBUILD_GUI=ON -DCMAKE_BUILD_TYPE=Release -DCLIENT_VERSION_IS_RELEASE=true -S$(pwd) -B$(pwd)/build
309309
cd build && make -j$NJOBS
310310
- name: Prepare Files for Artifact
311311
run: |

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ set(CLIENT_VERSION_MINOR 14)
2222
set(CLIENT_VERSION_REVISION 14)
2323
set(CLIENT_VERSION_BUILD 1)
2424
set(CLIENT_VERSION_RC 0)
25-
set(CLIENT_VERSION_IS_RELEASE "false")
25+
set(CLIENT_VERSION_IS_RELEASE "false" CACHE STRING "Is this a release build?")
2626
set(COPYRIGHT_YEAR "2024")
2727

2828
# During the enabling of the CXX and CXXOBJ languages, we modify

contrib/guix/libexec/build.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -388,6 +388,7 @@ mkdir -p "$DISTSRC"
388388
-DBUILD_CLI=ON \
389389
-DBUILD_GUI=ON \
390390
-DBUILD_TESTS=OFF \
391+
-DCLIENT_VERSION_IS_RELEASE=true \
391392
${CMAKEFLAGS}
392393

393394
make -C build --jobs="$JOBS"

0 commit comments

Comments
 (0)