Skip to content

Commit 949ddbb

Browse files
pmienkpmienk
authored
Merge pull request #1005 from pmienk/master
Regenerate with CI matrix changes.
2 parents d707912 + 49f830a commit 949ddbb

2 files changed

Lines changed: 75 additions & 93 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 57 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,6 @@ jobs:
1717

1818
matrix:
1919
include:
20-
- image: macos-latest
21-
config: "release"
22-
link: "dynamic"
23-
cc: "clang"
24-
cxx: "clang++"
25-
flags: ""
26-
coverage: ""
27-
boost: "--build-boost"
28-
secp256k1: "--build-secp256k1"
29-
options: "--enable-isystem"
30-
3120
- image: macos-latest
3221
config: "release"
3322
link: "static"
@@ -42,17 +31,18 @@ jobs:
4231
- image: ubuntu-24.04
4332
config: "debug"
4433
link: "dynamic"
45-
cc: "clang-18"
46-
cxx: "clang++-18"
34+
cc: "clang-19"
35+
cxx: "clang++-19"
4736
flags: ""
4837
coverage: ""
38+
package: "clang-19 clang++-19"
4939
boost: "--build-boost"
5040
secp256k1: "--build-secp256k1"
5141
options: "--enable-isystem"
5242

5343
- image: ubuntu-24.04
5444
config: "release"
55-
link: "static"
45+
link: "dynamic"
5646
cc: "clang-18"
5747
cxx: "clang++-18"
5848
flags: ""
@@ -62,23 +52,24 @@ jobs:
6252
options: "--enable-isystem"
6353

6454
- image: ubuntu-24.04
65-
config: "release"
66-
link: "dynamic"
67-
cc: "gcc-12"
68-
cxx: "g++-12"
69-
flags: ""
70-
coverage: ""
55+
config: "debug"
56+
link: "static"
57+
cc: "gcc-13"
58+
cxx: "g++-13"
59+
flags: "--coverage -fprofile-update=atomic"
60+
coverage: "lcov"
7161
boost: "--build-boost"
7262
secp256k1: "--build-secp256k1"
7363
options: "--enable-isystem"
7464

7565
- image: ubuntu-24.04
76-
config: "debug"
66+
config: "release"
7767
link: "static"
78-
cc: "gcc"
79-
cxx: "g++"
80-
flags: "--coverage -fprofile-update=atomic"
81-
coverage: "lcov"
68+
cc: "gcc-15"
69+
cxx: "g++-15"
70+
flags: ""
71+
coverage: ""
72+
package: "g++-15 gcc-15"
8273
boost: "--build-boost"
8374
secp256k1: "--build-secp256k1"
8475
options: "--enable-isystem"
@@ -137,6 +128,13 @@ jobs:
137128
shell: bash
138129
run: |
139130
sudo apt-get update
131+
if [[ "${{ matrix.package }}" == *"g++-15"* ]] ||
132+
[[ "${{ matrix.package }}" == *"gcc-15"* ]] ||
133+
[[ "${{ matrix.package }}" == *"g++-16"* ]] ||
134+
[[ "${{ matrix.package }}" == *"gcc-16"* ]]; then
135+
sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
136+
sudo apt-get update
137+
fi
140138
sudo apt-get install git build-essential autoconf automake libtool pkg-config ${{ matrix.package || '' }}
141139
if [[ "${{ matrix.coverage }}" == "lcov" ]]; then
142140
sudo apt-get install lcov
@@ -249,32 +247,10 @@ jobs:
249247
matrix:
250248
include:
251249
- image: macos-latest
252-
config: "release"
250+
config: "debug"
253251
link: "dynamic"
254252
cc: "clang"
255253
cxx: "clang++"
256-
flags: "-DNDEBUG"
257-
coverage: ""
258-
boost: "--build-boost"
259-
secp256k1: "--build-secp256k1"
260-
options: "--verbose"
261-
262-
- image: macos-latest
263-
config: "release"
264-
link: "static"
265-
cc: "clang"
266-
cxx: "clang++"
267-
flags: ""
268-
coverage: ""
269-
boost: "--build-boost"
270-
secp256k1: "--build-secp256k1"
271-
options: "--verbose"
272-
273-
- image: ubuntu-24.04
274-
config: "debug"
275-
link: "dynamic"
276-
cc: "clang-18"
277-
cxx: "clang++-18"
278254
flags: ""
279255
coverage: ""
280256
boost: "--build-boost"
@@ -284,10 +260,11 @@ jobs:
284260
- image: ubuntu-24.04
285261
config: "release"
286262
link: "static"
287-
cc: "clang-18"
288-
cxx: "clang++-18"
263+
cc: "clang-19"
264+
cxx: "clang++-19"
289265
flags: ""
290266
coverage: ""
267+
package: "clang-19 clang++-19"
291268
boost: "--build-boost"
292269
secp256k1: "--build-secp256k1"
293270
options: ""
@@ -306,14 +283,26 @@ jobs:
306283
- image: ubuntu-24.04
307284
config: "debug"
308285
link: "static"
309-
cc: "gcc"
310-
cxx: "g++"
286+
cc: "gcc-14"
287+
cxx: "g++-14"
311288
flags: ""
312289
coverage: ""
313290
boost: "--build-boost"
314291
secp256k1: "--build-secp256k1"
315292
options: ""
316293

294+
- image: ubuntu-24.04
295+
config: "debug"
296+
link: "dynamic"
297+
cc: "gcc-16"
298+
cxx: "g++-16"
299+
flags: ""
300+
coverage: ""
301+
package: "g++-16 gcc-16"
302+
boost: "--build-boost"
303+
secp256k1: "--build-secp256k1"
304+
options: ""
305+
317306
runs-on: ${{ matrix.image }}
318307

319308
env:
@@ -368,6 +357,13 @@ jobs:
368357
shell: bash
369358
run: |
370359
sudo apt-get update
360+
if [[ "${{ matrix.package }}" == *"g++-15"* ]] ||
361+
[[ "${{ matrix.package }}" == *"gcc-15"* ]] ||
362+
[[ "${{ matrix.package }}" == *"g++-16"* ]] ||
363+
[[ "${{ matrix.package }}" == *"gcc-16"* ]]; then
364+
sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
365+
sudo apt-get update
366+
fi
371367
sudo apt-get install git build-essential autoconf automake libtool pkg-config ${{ matrix.package || '' }}
372368
if [[ "${{ matrix.coverage }}" == "lcov" ]]; then
373369
sudo apt-get install lcov
@@ -480,7 +476,7 @@ jobs:
480476
matrix:
481477
include:
482478
- image: ubuntu-24.04
483-
preset: "nix-gnu-debug-shared"
479+
preset: "nix-gnu-release-shared"
484480
cc: "clang-18"
485481
cxx: "clang++-18"
486482
flags: ""
@@ -491,16 +487,6 @@ jobs:
491487

492488
- image: ubuntu-24.04
493489
preset: "nix-gnu-release-static"
494-
cc: "clang-18"
495-
cxx: "clang++-18"
496-
flags: ""
497-
coverage: ""
498-
boost: "--build-boost"
499-
secp256k1: "--build-secp256k1"
500-
options: ""
501-
502-
- image: ubuntu-24.04
503-
preset: "nix-gnu-release-shared"
504490
cc: "gcc-12"
505491
cxx: "g++-12"
506492
flags: ""
@@ -563,6 +549,13 @@ jobs:
563549
shell: bash
564550
run: |
565551
sudo apt-get update
552+
if [[ "${{ matrix.package }}" == *"g++-15"* ]] ||
553+
[[ "${{ matrix.package }}" == *"gcc-15"* ]] ||
554+
[[ "${{ matrix.package }}" == *"g++-16"* ]] ||
555+
[[ "${{ matrix.package }}" == *"gcc-16"* ]]; then
556+
sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
557+
sudo apt-get update
558+
fi
566559
sudo apt-get install git build-essential autoconf automake libtool pkg-config ${{ matrix.package || '' }}
567560
if [[ "${{ matrix.coverage }}" == "lcov" ]]; then
568561
sudo apt-get install lcov
@@ -669,25 +662,14 @@ jobs:
669662

670663
matrix:
671664
include:
672-
- image: windows-latest
673-
configuration: "StaticRelease"
674-
platform: "x64"
675-
version: "vs2022"
676-
tests: "*"
677-
678665
- image: windows-latest
679666
configuration: "StaticDebug"
680667
platform: "x64"
681668
version: "vs2022"
682669
tests: "*"
683-
- image: windows-2025-vs2026
684-
configuration: "StaticRelease"
685-
platform: "x64"
686-
version: "vs2026"
687-
tests: "*"
688670

689671
- image: windows-2025-vs2026
690-
configuration: "StaticDebug"
672+
configuration: "StaticRelease"
691673
platform: "x64"
692674
version: "vs2026"
693675
tests: "*"

‎builds/msvc/build-msvc.cmd‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -509,8 +509,8 @@ if "!libbitcoin_node_TAG!" == "" (
509509
if "!CD_MODE!" == "-f" (
510510
call :msg_warn "Reinitializing '%CD_DIRECTORY%'..."
511511
rmdir /S /Q "!CD_DIRECTORY!"
512-
if %ERRORLEVEL% neq 0 (
513-
exit /b %ERRORLEVEL%
512+
if !ERRORLEVEL! neq 0 (
513+
exit /b !ERRORLEVEL!
514514
)
515515

516516
mkdir "!CD_DIRECTORY!"
@@ -520,67 +520,67 @@ if "!libbitcoin_node_TAG!" == "" (
520520
) else (
521521
call :msg "Initializing '!CD_DIRECTORY!'..."
522522
)
523-
exit /b %ERRORLEVEL%
523+
exit /b !ERRORLEVEL!
524524

525525
:create_directory_force
526526
call :create_directory "%~1" -f
527-
exit /b %ERRORLEVEL%
527+
exit /b !ERRORLEVEL!
528528

529529
:pop_directory
530530
call :msg_verbose "*** move pre: '!CD!'"
531531
popd
532-
if %ERRORLEVEL% neq 0 (
533-
exit /b %ERRORLEVEL%
532+
if !ERRORLEVEL! neq 0 (
533+
exit /b !ERRORLEVEL!
534534
)
535535
call :msg_verbose "*** move post: '!CD!'"
536-
exit /b %ERRORLEVEL%
536+
exit /b !ERRORLEVEL!
537537

538538
:push_directory
539539
call :msg_verbose "*** move pre: '!CD!'"
540540
pushd %1
541-
if %ERRORLEVEL% neq 0 (
542-
exit /b %ERRORLEVEL%
541+
if !ERRORLEVEL! neq 0 (
542+
exit /b !ERRORLEVEL!
543543
)
544544
call :msg_verbose "*** move post: '!CD!'"
545-
exit /b %ERRORLEVEL%
545+
exit /b !ERRORLEVEL!
546546

547547
:remove_directory_force
548548
call :msg_verbose "*** removing: '%~1'"
549549
rmdir /S /Q "%~1"
550-
exit /b %ERRORLEVEL%
550+
exit /b !ERRORLEVEL!
551551

552552
:msg_heading
553553
call :msg "***************************************************************************"
554554
call :msg "%~1"
555555
call :msg "***************************************************************************"
556-
exit /b %ERRORLEVEL%
556+
exit /b !ERRORLEVEL!
557557

558558
:msg
559559
if "%~1" == "" (
560560
echo.
561561
) else (
562562
echo %~1
563563
)
564-
exit /b %ERRORLEVEL%
564+
exit /b !ERRORLEVEL!
565565

566566
:msg_empty
567567
echo.
568-
exit /b %ERRORLEVEL%
568+
exit /b !ERRORLEVEL!
569569

570570
:msg_verbose
571571
if "!DISPLAY_VERBOSE!" == "yes" (
572572
echo %~1
573573
)
574-
exit /b %ERRORLEVEL%
574+
exit /b !ERRORLEVEL!
575575

576576
:msg_success
577577
echo %~1
578-
exit /b %ERRORLEVEL%
578+
exit /b !ERRORLEVEL!
579579

580580
:msg_warn
581581
echo %~1
582-
exit /b %ERRORLEVEL%
582+
exit /b !ERRORLEVEL!
583583

584584
:msg_error
585585
echo %~1
586-
exit /b %ERRORLEVEL%
586+
exit /b !ERRORLEVEL!

0 commit comments

Comments
 (0)