Skip to content

Commit b59ec6e

Browse files
authored
Merge pull request #744 from pmienk/master
Integrate cmake refactor, presets installation correction.
2 parents 7dda4c0 + 9a1b9db commit b59ec6e

File tree

7 files changed

+426
-1271
lines changed

7 files changed

+426
-1271
lines changed

.github/workflows/ci.yml

Lines changed: 6 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ jobs:
2525
coverage: "nocov"
2626
detectcpuflags: "ignore"
2727
boost: "--build-boost"
28-
icu: ""
2928
llvm: ""
3029
secp256k1: "--build-secp256k1"
3130
cc: "clang-18"
@@ -42,7 +41,6 @@ jobs:
4241
coverage: "nocov"
4342
detectcpuflags: "ignore"
4443
boost: "--build-boost"
45-
icu: "--build-icu --with-icu"
4644
llvm: ""
4745
secp256k1: "--build-secp256k1"
4846
cc: "clang-18"
@@ -59,7 +57,6 @@ jobs:
5957
coverage: "nocov"
6058
detectcpuflags: "ignore"
6159
boost: "--build-boost"
62-
icu: ""
6360
llvm: ""
6461
secp256k1: "--build-secp256k1"
6562
cc: "gcc-12"
@@ -76,7 +73,6 @@ jobs:
7673
coverage: "cov"
7774
detectcpuflags: "detect"
7875
boost: "--build-boost"
79-
icu: "--build-icu --with-icu"
8076
llvm: ""
8177
secp256k1: "--build-secp256k1"
8278
cc: "gcc"
@@ -93,14 +89,13 @@ jobs:
9389
coverage: "nocov"
9490
detectcpuflags: "ignore"
9591
boost: "--build-boost"
96-
icu: "--with-icu"
9792
llvm: ""
9893
secp256k1: "--build-secp256k1"
9994
cc: "clang"
10095
flags: "-Os -fPIE"
10196
options: "--enable-isystem"
10297
packager: "brew"
103-
packages: "icu4c"
98+
packages: ""
10499

105100
- os: macos-latest
106101
cxx: "clang++"
@@ -110,7 +105,6 @@ jobs:
110105
coverage: "nocov"
111106
detectcpuflags: "ignore"
112107
boost: "--build-boost"
113-
icu: "--build-icu --with-icu"
114108
llvm: ""
115109
secp256k1: "--build-secp256k1"
116110
cc: "clang"
@@ -131,7 +125,7 @@ jobs:
131125

132126
steps:
133127
- name: Checkout repository
134-
uses: actions/checkout@v4
128+
uses: actions/checkout@v6
135129

136130
- name: Prepare toolchain [generic]
137131
run: |
@@ -214,7 +208,6 @@ jobs:
214208
${{ env.ASSERT_NDEBUG }}
215209
${{ env.CPU_SUPPORTED_FLAGS }}
216210
${{ matrix.boost }}
217-
${{ matrix.icu }}
218211
${{ matrix.secp256k1 }}
219212
220213
- name: Coveralls Calculation
@@ -296,7 +289,6 @@ jobs:
296289
coverage: "nocov"
297290
detectcpuflags: "ignore"
298291
boost: "--build-boost"
299-
icu: ""
300292
llvm: ""
301293
secp256k1: "--build-secp256k1"
302294
cc: "clang-18"
@@ -313,7 +305,6 @@ jobs:
313305
coverage: "nocov"
314306
detectcpuflags: "ignore"
315307
boost: "--build-boost"
316-
icu: "--build-icu --with-icu"
317308
llvm: ""
318309
secp256k1: "--build-secp256k1"
319310
cc: "clang-18"
@@ -330,7 +321,6 @@ jobs:
330321
coverage: "nocov"
331322
detectcpuflags: "ignore"
332323
boost: "--build-boost"
333-
icu: ""
334324
llvm: ""
335325
secp256k1: "--build-secp256k1"
336326
cc: "gcc-12"
@@ -347,7 +337,6 @@ jobs:
347337
coverage: "nocov"
348338
detectcpuflags: "ignore"
349339
boost: "--build-boost"
350-
icu: "--build-icu --with-icu"
351340
llvm: ""
352341
secp256k1: "--build-secp256k1"
353342
cc: "gcc-12"
@@ -364,14 +353,13 @@ jobs:
364353
coverage: "nocov"
365354
detectcpuflags: "ignore"
366355
boost: "--build-boost"
367-
icu: "--with-icu"
368356
llvm: ""
369357
secp256k1: "--build-secp256k1"
370358
cc: "clang"
371359
flags: "-Os -fPIE"
372360
options: ""
373361
packager: "brew"
374-
packages: "icu4c"
362+
packages: ""
375363

376364
- os: macos-latest
377365
cxx: "clang++"
@@ -381,7 +369,6 @@ jobs:
381369
coverage: "nocov"
382370
detectcpuflags: "ignore"
383371
boost: "--build-boost"
384-
icu: "--build-icu --with-icu"
385372
llvm: ""
386373
secp256k1: "--build-secp256k1"
387374
cc: "clang"
@@ -402,7 +389,7 @@ jobs:
402389

403390
steps:
404391
- name: Checkout repository
405-
uses: actions/checkout@v4
392+
uses: actions/checkout@v6
406393

407394
- name: Prepare toolchain [generic]
408395
run: |
@@ -488,7 +475,6 @@ jobs:
488475
${{ env.ASSERT_NDEBUG }}
489476
${{ env.CPU_SUPPORTED_FLAGS }}
490477
${{ matrix.boost }}
491-
${{ matrix.icu }}
492478
${{ matrix.secp256k1 }}
493479
494480
- name: Coveralls Calculation
@@ -581,7 +567,6 @@ jobs:
581567
coverage: "nocov"
582568
detectcpuflags: "ignore"
583569
boost: "--build-boost"
584-
icu: ""
585570
llvm: ""
586571
secp256k1: "--build-secp256k1"
587572
cc: "clang-18"
@@ -599,7 +584,6 @@ jobs:
599584
coverage: "nocov"
600585
detectcpuflags: "ignore"
601586
boost: "--build-boost"
602-
icu: "--build-icu --with-icu"
603587
llvm: ""
604588
secp256k1: "--build-secp256k1"
605589
cc: "clang-18"
@@ -617,7 +601,6 @@ jobs:
617601
coverage: "nocov"
618602
detectcpuflags: "ignore"
619603
boost: "--build-boost"
620-
icu: ""
621604
llvm: ""
622605
secp256k1: "--build-secp256k1"
623606
cc: "gcc-12"
@@ -638,7 +621,7 @@ jobs:
638621

639622
steps:
640623
- name: Checkout repository
641-
uses: actions/checkout@v4
624+
uses: actions/checkout@v6
642625

643626
- name: Prepare toolchain [generic]
644627
run: |
@@ -725,7 +708,6 @@ jobs:
725708
${{ env.ASSERT_NDEBUG }}
726709
${{ env.CPU_SUPPORTED_FLAGS }}
727710
${{ matrix.boost }}
728-
${{ matrix.icu }}
729711
${{ matrix.secp256k1 }}
730712
731713
- name: Coveralls Calculation
@@ -841,7 +823,7 @@ jobs:
841823
msbuild-architecture: x64
842824

843825
- name: Checkout repository
844-
uses: actions/checkout@v4
826+
uses: actions/checkout@v6
845827

846828
- name: Initialize SDK
847829
shell: powershell

0 commit comments

Comments
 (0)