Skip to content

Commit 1afbe89

Browse files
pmienkpmienk
committed
Regenerate artifacts.
1 parent 52e5896 commit 1afbe89

File tree

1 file changed

+37
-13
lines changed

1 file changed

+37
-13
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 37 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ jobs:
2626
detectcpuflags: "ignore"
2727
boost: "--build-boost"
2828
icu: ""
29+
llvm: ""
2930
secp256k1: "--build-secp256k1"
3031
zmq: "--build-zmq"
3132
cc: "clang-16"
@@ -43,6 +44,7 @@ jobs:
4344
detectcpuflags: "ignore"
4445
boost: "--build-boost"
4546
icu: "--build-icu --with-icu"
47+
llvm: ""
4648
secp256k1: "--build-secp256k1"
4749
zmq: "--build-zmq"
4850
cc: "clang-16"
@@ -60,6 +62,7 @@ jobs:
6062
detectcpuflags: "ignore"
6163
boost: "--build-boost"
6264
icu: ""
65+
llvm: ""
6366
secp256k1: "--build-secp256k1"
6467
zmq: "--build-zmq"
6568
cc: "gcc-12"
@@ -77,6 +80,7 @@ jobs:
7780
detectcpuflags: "detect"
7881
boost: "--build-boost"
7982
icu: "--build-icu --with-icu"
83+
llvm: ""
8084
secp256k1: "--build-secp256k1"
8185
zmq: "--build-zmq"
8286
cc: "gcc-12"
@@ -94,13 +98,14 @@ jobs:
9498
detectcpuflags: "ignore"
9599
boost: "--build-boost"
96100
icu: ""
101+
llvm: "llvm@16"
97102
secp256k1: "--build-secp256k1"
98103
zmq: "--build-zmq"
99104
cc: "clang"
100105
flags: "-Os -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE"
101106
options: "--enable-isystem"
102107
packager: "brew"
103-
packages: "icu4c"
108+
packages: "llvm@16 icu4c"
104109

105110
- os: macos-latest
106111
cxx: "clang++"
@@ -111,13 +116,14 @@ jobs:
111116
detectcpuflags: "ignore"
112117
boost: "--build-boost"
113118
icu: ""
119+
llvm: "llvm@16"
114120
secp256k1: "--build-secp256k1"
115121
zmq: "--build-zmq"
116122
cc: "clang"
117123
flags: "-Os -fvisibility=hidden -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE"
118124
options: "--enable-isystem"
119125
packager: "brew"
120-
packages: "icu4c"
126+
packages: "llvm@16 icu4c"
121127

122128

123129
runs-on: ${{ matrix.os }}
@@ -147,6 +153,9 @@ jobs:
147153
if: ${{ matrix.packager == 'brew' }}
148154
run: |
149155
brew install autoconf automake libtool ${{ matrix.packages }}
156+
if [[ -n ${{ matrix.llvm }} ]]; then
157+
echo "PATH=/opt/homebrew/opt/${{ matrix.llvm }}/bin:$PATH" >> $GITHUB_ENV
158+
fi
150159
151160
- name: Determine CPU flags
152161
shell: bash
@@ -218,9 +227,9 @@ jobs:
218227
- name: Coveralls Calculation
219228
if: ${{ matrix.coverage == 'cov' }}
220229
run: |
221-
lcov --directory . --capture --output-file coverage.info
222-
lcov --remove coverage.info "/usr/*" "${{ env.LIBBITCOIN_SRC_PATH }}prefix/*" "${{ github.workspace }}/examples/*" "${{ github.workspace }}/test/*" --output-file coverage.info
223-
lcov --list coverage.info
230+
lcov --directory . --capture --ignore-errors version --output-file coverage.info
231+
lcov --remove coverage.info "/usr/*" "${{ env.LIBBITCOIN_SRC_PATH }}prefix/*" "${{ github.workspace }}/examples/*" "${{ github.workspace }}/test/*" --output-file --ignore-errors version coverage.info
232+
lcov --list --ignore-errors version coverage.info
224233
225234
- name: Coveralls.io Upload
226235
if: ${{ matrix.coverage == 'cov' }}
@@ -295,6 +304,7 @@ jobs:
295304
detectcpuflags: "ignore"
296305
boost: "--build-boost"
297306
icu: ""
307+
llvm: ""
298308
secp256k1: "--build-secp256k1"
299309
zmq: "--build-zmq"
300310
cc: "clang-16"
@@ -312,6 +322,7 @@ jobs:
312322
detectcpuflags: "ignore"
313323
boost: "--build-boost"
314324
icu: "--build-icu --with-icu"
325+
llvm: ""
315326
secp256k1: "--build-secp256k1"
316327
zmq: "--build-zmq"
317328
cc: "clang-16"
@@ -329,6 +340,7 @@ jobs:
329340
detectcpuflags: "ignore"
330341
boost: "--build-boost"
331342
icu: ""
343+
llvm: ""
332344
secp256k1: "--build-secp256k1"
333345
zmq: "--build-zmq"
334346
cc: "gcc-12"
@@ -346,6 +358,7 @@ jobs:
346358
detectcpuflags: "ignore"
347359
boost: "--build-boost"
348360
icu: "--build-icu --with-icu"
361+
llvm: ""
349362
secp256k1: "--build-secp256k1"
350363
zmq: "--build-zmq"
351364
cc: "gcc-12"
@@ -363,13 +376,14 @@ jobs:
363376
detectcpuflags: "ignore"
364377
boost: "--build-boost"
365378
icu: ""
379+
llvm: "llvm@16"
366380
secp256k1: "--build-secp256k1"
367381
zmq: "--build-zmq"
368382
cc: "clang"
369383
flags: "-Os -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE"
370384
options: ""
371385
packager: "brew"
372-
packages: "icu4c"
386+
packages: "llvm@16 icu4c"
373387

374388
- os: macos-latest
375389
cxx: "clang++"
@@ -380,13 +394,14 @@ jobs:
380394
detectcpuflags: "ignore"
381395
boost: "--build-boost"
382396
icu: ""
397+
llvm: "llvm@16"
383398
secp256k1: "--build-secp256k1"
384399
zmq: "--build-zmq"
385400
cc: "clang"
386401
flags: "-Os -fvisibility=hidden -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE"
387402
options: ""
388403
packager: "brew"
389-
packages: "icu4c"
404+
packages: "llvm@16 icu4c"
390405

391406

392407
runs-on: ${{ matrix.os }}
@@ -416,6 +431,9 @@ jobs:
416431
if: ${{ matrix.packager == 'brew' }}
417432
run: |
418433
brew install autoconf automake libtool ${{ matrix.packages }}
434+
if [[ -n ${{ matrix.llvm }} ]]; then
435+
echo "PATH=/opt/homebrew/opt/${{ matrix.llvm }}/bin:$PATH" >> $GITHUB_ENV
436+
fi
419437
420438
- name: Determine CPU flags
421439
shell: bash
@@ -490,9 +508,9 @@ jobs:
490508
- name: Coveralls Calculation
491509
if: ${{ matrix.coverage == 'cov' }}
492510
run: |
493-
lcov --directory . --capture --output-file coverage.info
494-
lcov --remove coverage.info "/usr/*" "${{ env.LIBBITCOIN_SRC_PATH }}prefix/*" "${{ github.workspace }}/examples/*" "${{ github.workspace }}/test/*" --output-file coverage.info
495-
lcov --list coverage.info
511+
lcov --directory . --capture --ignore-errors version --output-file coverage.info
512+
lcov --remove coverage.info "/usr/*" "${{ env.LIBBITCOIN_SRC_PATH }}prefix/*" "${{ github.workspace }}/examples/*" "${{ github.workspace }}/test/*" --output-file --ignore-errors version coverage.info
513+
lcov --list --ignore-errors version coverage.info
496514
497515
- name: Coveralls.io Upload
498516
if: ${{ matrix.coverage == 'cov' }}
@@ -578,6 +596,7 @@ jobs:
578596
detectcpuflags: "ignore"
579597
boost: "--build-boost"
580598
icu: ""
599+
llvm: ""
581600
secp256k1: "--build-secp256k1"
582601
zmq: "--build-zmq"
583602
cc: "clang-16"
@@ -596,6 +615,7 @@ jobs:
596615
detectcpuflags: "ignore"
597616
boost: "--build-boost"
598617
icu: "--build-icu --with-icu"
618+
llvm: ""
599619
secp256k1: "--build-secp256k1"
600620
zmq: "--build-zmq"
601621
cc: "clang-16"
@@ -614,6 +634,7 @@ jobs:
614634
detectcpuflags: "ignore"
615635
boost: "--build-boost"
616636
icu: ""
637+
llvm: ""
617638
secp256k1: "--build-secp256k1"
618639
zmq: "--build-zmq"
619640
cc: "gcc-12"
@@ -650,6 +671,9 @@ jobs:
650671
if: ${{ matrix.packager == 'brew' }}
651672
run: |
652673
brew install autoconf automake libtool ${{ matrix.packages }}
674+
if [[ -n ${{ matrix.llvm }} ]]; then
675+
echo "PATH=/opt/homebrew/opt/${{ matrix.llvm }}/bin:$PATH" >> $GITHUB_ENV
676+
fi
653677
654678
- name: Determine CPU flags
655679
shell: bash
@@ -725,9 +749,9 @@ jobs:
725749
- name: Coveralls Calculation
726750
if: ${{ matrix.coverage == 'cov' }}
727751
run: |
728-
lcov --directory . --capture --output-file coverage.info
729-
lcov --remove coverage.info "/usr/*" "${{ env.LIBBITCOIN_SRC_PATH }}prefix/*" "${{ github.workspace }}/examples/*" "${{ github.workspace }}/test/*" --output-file coverage.info
730-
lcov --list coverage.info
752+
lcov --directory . --capture --ignore-errors version --output-file coverage.info
753+
lcov --remove coverage.info "/usr/*" "${{ env.LIBBITCOIN_SRC_PATH }}prefix/*" "${{ github.workspace }}/examples/*" "${{ github.workspace }}/test/*" --output-file --ignore-errors version coverage.info
754+
lcov --list --ignore-errors version coverage.info
731755
732756
- name: Coveralls.io Upload
733757
if: ${{ matrix.coverage == 'cov' }}

0 commit comments

Comments
 (0)