Skip to content

Commit 5f6dbb1

Browse files
committed
Merge pull request #10500
fba83c1 ci: build: harmonize build commands (tobtoht)
2 parents 6400b68 + fba83c1 commit 5f6dbb1

1 file changed

Lines changed: 11 additions & 7 deletions

File tree

.github/workflows/build.yml

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414
env:
1515
REMOVE_BUNDLED_PACKAGES : sudo rm -rf /usr/local
1616
# ARCH="default" (not "native") ensures, that a different execution host can execute binaries compiled elsewhere.
17-
BUILD_DEFAULT_LINUX: 'cmake -S . -B build -D ARCH="default" -D BUILD_TESTS=ON -D ENABLE_FUZZ_TEST=ON -D CMAKE_BUILD_TYPE=Release && cmake --build build --target all && cmake --build build --target wallet_api'
17+
BUILD_DEFAULT: 'cmake -S . -B build -D ARCH="default" -D BUILD_TESTS=ON -D ENABLE_FUZZ_TEST=ON -D CMAKE_BUILD_TYPE=Release && cmake --build build --target all && cmake --build build --target wallet_api'
1818
APT_INSTALL_LINUX: 'apt -y install build-essential cmake libboost-all-dev libunbound-dev graphviz doxygen libunwind8-dev pkg-config libssl-dev libzmq3-dev libsodium-dev libhidapi-dev libusb-1.0-0-dev libprotobuf-dev protobuf-compiler ccache curl git'
1919
APT_SET_CONF: |
2020
tee -a /etc/apt/apt.conf.d/80-custom << EOF
@@ -55,9 +55,11 @@ jobs:
5555
brew update
5656
brew install --quiet cmake boost hidapi openssl zmq expat libunwind-headers protobuf ccache
5757
- name: build
58+
env:
59+
CMAKE_BUILD_PARALLEL_LEVEL: ${{env.MAKE_JOB_COUNT}}
5860
run: |
5961
${{env.CCACHE_SETTINGS}}
60-
make -j${{env.MAKE_JOB_COUNT}}
62+
${{env.BUILD_DEFAULT}}
6163
6264
build-windows:
6365
name: 'Windows (MSYS2)'
@@ -83,9 +85,11 @@ jobs:
8385
install: mingw-w64-x86_64-toolchain make mingw-w64-x86_64-cmake mingw-w64-x86_64-ccache mingw-w64-x86_64-boost mingw-w64-x86_64-openssl mingw-w64-x86_64-zeromq mingw-w64-x86_64-libsodium mingw-w64-x86_64-hidapi mingw-w64-x86_64-protobuf mingw-w64-x86_64-libusb mingw-w64-x86_64-unbound mingw-w64-x86_64-rust git pkg-config
8486
- uses: ./.github/actions/set-make-job-count
8587
- name: build
88+
env:
89+
CMAKE_BUILD_PARALLEL_LEVEL: ${{env.MAKE_JOB_COUNT}}
8690
run: |
8791
${{env.CCACHE_SETTINGS}}
88-
make release-static -j${{env.MAKE_JOB_COUNT}}
92+
${{env.BUILD_DEFAULT}}
8993
9094
build-arch:
9195
name: 'Arch Linux'
@@ -104,7 +108,7 @@ jobs:
104108
- name: build
105109
env:
106110
CMAKE_BUILD_PARALLEL_LEVEL: ${{env.MAKE_JOB_COUNT}}
107-
run: ${{env.BUILD_DEFAULT_LINUX}}
111+
run: ${{env.BUILD_DEFAULT}}
108112

109113
build-debian:
110114
# Oldest supported Debian version
@@ -132,7 +136,7 @@ jobs:
132136
- name: build
133137
env:
134138
CMAKE_BUILD_PARALLEL_LEVEL: ${{env.MAKE_JOB_COUNT}}
135-
run: ${{env.BUILD_DEFAULT_LINUX}}
139+
run: ${{env.BUILD_DEFAULT}}
136140

137141
build-ubuntu:
138142
name: ${{ matrix.name }}
@@ -175,7 +179,7 @@ jobs:
175179
CMAKE_BUILD_PARALLEL_LEVEL: ${{env.MAKE_JOB_COUNT}}
176180
run: |
177181
${{env.CCACHE_SETTINGS}}
178-
${{env.BUILD_DEFAULT_LINUX}}
182+
${{env.BUILD_DEFAULT}}
179183
180184
test-ubuntu:
181185
name: "${{ matrix.name }} (tests)"
@@ -228,7 +232,7 @@ jobs:
228232
CMAKE_BUILD_PARALLEL_LEVEL: ${{env.MAKE_JOB_COUNT}}
229233
run: |
230234
${{env.CCACHE_SETTINGS}}
231-
${{env.BUILD_DEFAULT_LINUX}}
235+
${{env.BUILD_DEFAULT}}
232236
cmake --build build --target test
233237
234238
source-archive:

0 commit comments

Comments
 (0)