Skip to content

Commit c2aa446

Browse files
CI Update: fix multi -DCMAKE_ARGS
1 parent e5b5369 commit c2aa446

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

.github/workflows/nix-ci.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ jobs:
100100
config: build-gui
101101
- system: x86_64-linux
102102
runner_label: ubuntu-latest
103-
cmake_flags: -DBUILD_GUI=ON -DBUILD_BENCH=ON
103+
cmake_flags: -DBUILD_GUI=ON\;-DBUILD_BENCH=ON
104104
ctest_extra: ""
105105
config: build-gui+bench
106106
- system: aarch64-linux
@@ -114,6 +114,7 @@ jobs:
114114
- name: Checkout Nightly Repo
115115
uses: actions/checkout@v4
116116
with:
117+
ref: ${{ github.head_ref }}
117118
fetch-depth: 1
118119
- name: Checkout Bix Repo
119120
uses: actions/checkout@v4
@@ -167,7 +168,7 @@ jobs:
167168
-DBUILD_NAME_SUFFIX=${{ matrix.config }}--${{ inputs.ctest_build_name_suffix }} \
168169
${{ matrix.ctest_extra }} \
169170
-DTREAT_WARNINGS_AS_ERRORS=ON \
170-
-DCMAKE_ARGS='${{ matrix.cmake_flags }}' \
171+
-DCMAKE_ARGS=${{ matrix.cmake_flags }} \
171172
-DMODEL=${{ inputs.ctest_model }}
172173
"
173174
notify-failure:
@@ -194,8 +195,8 @@ jobs:
194195
**This Repo Commit:** ${{ github.sha }}
195196
**Branch:** ${{ github.ref_name }}
196197
**Triggered by:** ${{ github.event_name }}
197-
**Bitcoin Commit:** [\`${BITCOIN_COMMIT_SHORT}\`](https://github.com/bitcoin/bitcoin/commit/${BITCOIN_COMMIT})
198-
cc: @willcl-ark @fanquake" \
198+
**Bitcoin Commit:** [\`${BITCOIN_COMMIT_SHORT}\`](https://github.com/BrandonOdiwuor/bitcoin/commit/${BITCOIN_COMMIT})
199+
cc: @brandonodiwuor" \
199200
--repo ${{ github.repository }}
200201
env:
201202
GH_TOKEN: ${{ github.token }}

scripts/build-unit-test.cmake

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,8 @@ if(WITH_UPDATE AND CTEST_GIT_COMMAND)
175175
ctest_submit(PARTS "Update")
176176
endif()
177177

178-
ctest_configure(OPTIONS ${CONFIG_OPTIONS})
178+
list(JOIN CONFIG_OPTIONS ";" CONFIG_OPTIONS_STR)
179+
ctest_configure(OPTIONS "${CONFIG_OPTIONS_STR}")
179180
ctest_submit(PARTS "Configure")
180181

181182
ctest_build(

0 commit comments

Comments
 (0)