Skip to content

Commit dbe60e8

Browse files
pmienkpmienk
committed
Regenerate artifacts.
1 parent e6eeb9d commit dbe60e8

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
cc: "clang-16"
3132
flags: "-Og -fPIE"
@@ -42,6 +43,7 @@ jobs:
4243
detectcpuflags: "ignore"
4344
boost: "--build-boost"
4445
icu: "--build-icu --with-icu"
46+
llvm: ""
4547
secp256k1: "--build-secp256k1"
4648
cc: "clang-16"
4749
flags: "-Os -fPIE"
@@ -58,6 +60,7 @@ jobs:
5860
detectcpuflags: "ignore"
5961
boost: "--build-boost"
6062
icu: ""
63+
llvm: ""
6164
secp256k1: "--build-secp256k1"
6265
cc: "gcc-12"
6366
flags: "-Os -fPIE"
@@ -74,6 +77,7 @@ jobs:
7477
detectcpuflags: "detect"
7578
boost: "--build-boost"
7679
icu: "--build-icu --with-icu"
80+
llvm: ""
7781
secp256k1: "--build-secp256k1"
7882
cc: "gcc-12"
7983
flags: "-Os -g --coverage -fPIE"
@@ -90,12 +94,13 @@ jobs:
9094
detectcpuflags: "ignore"
9195
boost: "--build-boost"
9296
icu: ""
97+
llvm: "llvm@16"
9398
secp256k1: "--build-secp256k1"
9499
cc: "clang"
95100
flags: "-Os -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE"
96101
options: "--enable-isystem"
97102
packager: "brew"
98-
packages: "icu4c"
103+
packages: "llvm@16 icu4c"
99104

100105
- os: macos-latest
101106
cxx: "clang++"
@@ -106,12 +111,13 @@ jobs:
106111
detectcpuflags: "ignore"
107112
boost: "--build-boost"
108113
icu: ""
114+
llvm: "llvm@16"
109115
secp256k1: "--build-secp256k1"
110116
cc: "clang"
111117
flags: "-Os -fvisibility=hidden -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE"
112118
options: "--enable-isystem"
113119
packager: "brew"
114-
packages: "icu4c"
120+
packages: "llvm@16 icu4c"
115121

116122

117123
runs-on: ${{ matrix.os }}
@@ -141,6 +147,9 @@ jobs:
141147
if: ${{ matrix.packager == 'brew' }}
142148
run: |
143149
brew install autoconf automake libtool ${{ matrix.packages }}
150+
if [[ -n ${{ matrix.llvm }} ]]; then
151+
echo "PATH=/opt/homebrew/opt/${{ matrix.llvm }}/bin:$PATH" >> $GITHUB_ENV
152+
fi
144153
145154
- name: Determine CPU flags
146155
shell: bash
@@ -211,9 +220,9 @@ jobs:
211220
- name: Coveralls Calculation
212221
if: ${{ matrix.coverage == 'cov' }}
213222
run: |
214-
lcov --directory . --capture --output-file coverage.info
215-
lcov --remove coverage.info "/usr/*" "${{ env.LIBBITCOIN_SRC_PATH }}prefix/*" "${{ github.workspace }}/examples/*" "${{ github.workspace }}/test/*" --output-file coverage.info
216-
lcov --list coverage.info
223+
lcov --directory . --capture --ignore-errors version --output-file coverage.info
224+
lcov --remove coverage.info "/usr/*" "${{ env.LIBBITCOIN_SRC_PATH }}prefix/*" "${{ github.workspace }}/examples/*" "${{ github.workspace }}/test/*" --output-file --ignore-errors version coverage.info
225+
lcov --list --ignore-errors version coverage.info
217226
218227
- name: Coveralls.io Upload
219228
if: ${{ matrix.coverage == 'cov' }}
@@ -288,6 +297,7 @@ jobs:
288297
detectcpuflags: "ignore"
289298
boost: "--build-boost"
290299
icu: ""
300+
llvm: ""
291301
secp256k1: "--build-secp256k1"
292302
cc: "clang-16"
293303
flags: "-Og -fPIE"
@@ -304,6 +314,7 @@ jobs:
304314
detectcpuflags: "ignore"
305315
boost: "--build-boost"
306316
icu: "--build-icu --with-icu"
317+
llvm: ""
307318
secp256k1: "--build-secp256k1"
308319
cc: "clang-16"
309320
flags: "-Os -fPIE"
@@ -320,6 +331,7 @@ jobs:
320331
detectcpuflags: "ignore"
321332
boost: "--build-boost"
322333
icu: ""
334+
llvm: ""
323335
secp256k1: "--build-secp256k1"
324336
cc: "gcc-12"
325337
flags: "-Os -fPIE"
@@ -336,6 +348,7 @@ jobs:
336348
detectcpuflags: "ignore"
337349
boost: "--build-boost"
338350
icu: "--build-icu --with-icu"
351+
llvm: ""
339352
secp256k1: "--build-secp256k1"
340353
cc: "gcc-12"
341354
flags: "-Os -fPIE"
@@ -352,12 +365,13 @@ jobs:
352365
detectcpuflags: "ignore"
353366
boost: "--build-boost"
354367
icu: ""
368+
llvm: "llvm@16"
355369
secp256k1: "--build-secp256k1"
356370
cc: "clang"
357371
flags: "-Os -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE"
358372
options: ""
359373
packager: "brew"
360-
packages: "icu4c"
374+
packages: "llvm@16 icu4c"
361375

362376
- os: macos-latest
363377
cxx: "clang++"
@@ -368,12 +382,13 @@ jobs:
368382
detectcpuflags: "ignore"
369383
boost: "--build-boost"
370384
icu: ""
385+
llvm: "llvm@16"
371386
secp256k1: "--build-secp256k1"
372387
cc: "clang"
373388
flags: "-Os -fvisibility=hidden -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE"
374389
options: ""
375390
packager: "brew"
376-
packages: "icu4c"
391+
packages: "llvm@16 icu4c"
377392

378393

379394
runs-on: ${{ matrix.os }}
@@ -403,6 +418,9 @@ jobs:
403418
if: ${{ matrix.packager == 'brew' }}
404419
run: |
405420
brew install autoconf automake libtool ${{ matrix.packages }}
421+
if [[ -n ${{ matrix.llvm }} ]]; then
422+
echo "PATH=/opt/homebrew/opt/${{ matrix.llvm }}/bin:$PATH" >> $GITHUB_ENV
423+
fi
406424
407425
- name: Determine CPU flags
408426
shell: bash
@@ -476,9 +494,9 @@ jobs:
476494
- name: Coveralls Calculation
477495
if: ${{ matrix.coverage == 'cov' }}
478496
run: |
479-
lcov --directory . --capture --output-file coverage.info
480-
lcov --remove coverage.info "/usr/*" "${{ env.LIBBITCOIN_SRC_PATH }}prefix/*" "${{ github.workspace }}/examples/*" "${{ github.workspace }}/test/*" --output-file coverage.info
481-
lcov --list coverage.info
497+
lcov --directory . --capture --ignore-errors version --output-file coverage.info
498+
lcov --remove coverage.info "/usr/*" "${{ env.LIBBITCOIN_SRC_PATH }}prefix/*" "${{ github.workspace }}/examples/*" "${{ github.workspace }}/test/*" --output-file --ignore-errors version coverage.info
499+
lcov --list --ignore-errors version coverage.info
482500
483501
- name: Coveralls.io Upload
484502
if: ${{ matrix.coverage == 'cov' }}
@@ -564,6 +582,7 @@ jobs:
564582
detectcpuflags: "ignore"
565583
boost: "--build-boost"
566584
icu: ""
585+
llvm: ""
567586
secp256k1: "--build-secp256k1"
568587
cc: "clang-16"
569588
flags: "-Og -fPIE"
@@ -581,6 +600,7 @@ jobs:
581600
detectcpuflags: "ignore"
582601
boost: "--build-boost"
583602
icu: "--build-icu --with-icu"
603+
llvm: ""
584604
secp256k1: "--build-secp256k1"
585605
cc: "clang-16"
586606
flags: "-Os -fPIE"
@@ -598,6 +618,7 @@ jobs:
598618
detectcpuflags: "ignore"
599619
boost: "--build-boost"
600620
icu: ""
621+
llvm: ""
601622
secp256k1: "--build-secp256k1"
602623
cc: "gcc-12"
603624
flags: "-Os -fPIE"
@@ -633,6 +654,9 @@ jobs:
633654
if: ${{ matrix.packager == 'brew' }}
634655
run: |
635656
brew install autoconf automake libtool ${{ matrix.packages }}
657+
if [[ -n ${{ matrix.llvm }} ]]; then
658+
echo "PATH=/opt/homebrew/opt/${{ matrix.llvm }}/bin:$PATH" >> $GITHUB_ENV
659+
fi
636660
637661
- name: Determine CPU flags
638662
shell: bash
@@ -707,9 +731,9 @@ jobs:
707731
- name: Coveralls Calculation
708732
if: ${{ matrix.coverage == 'cov' }}
709733
run: |
710-
lcov --directory . --capture --output-file coverage.info
711-
lcov --remove coverage.info "/usr/*" "${{ env.LIBBITCOIN_SRC_PATH }}prefix/*" "${{ github.workspace }}/examples/*" "${{ github.workspace }}/test/*" --output-file coverage.info
712-
lcov --list coverage.info
734+
lcov --directory . --capture --ignore-errors version --output-file coverage.info
735+
lcov --remove coverage.info "/usr/*" "${{ env.LIBBITCOIN_SRC_PATH }}prefix/*" "${{ github.workspace }}/examples/*" "${{ github.workspace }}/test/*" --output-file --ignore-errors version coverage.info
736+
lcov --list --ignore-errors version coverage.info
713737
714738
- name: Coveralls.io Upload
715739
if: ${{ matrix.coverage == 'cov' }}

0 commit comments

Comments
 (0)