Skip to content

Commit 77c0121

Browse files
pmienkpmienk
authored
Merge pull request #258 from pmienk/master
Regenerate artifacts.
2 parents 10955f2 + fbd6ab5 commit 77c0121

File tree

7 files changed

+176
-127
lines changed

7 files changed

+176
-127
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 64 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -18,30 +18,30 @@ jobs:
1818
matrix:
1919
include:
2020
- os: ubuntu-22.04
21-
cxx: "clang++-14"
21+
cxx: "clang++-15"
2222
link: "dynamic"
23-
optimization: "size"
23+
optimization: "debug"
2424
assert: "debug"
2525
coverage: "nocov"
2626
boost: "--build-boost"
2727
icu: ""
2828
zmq: "--build-zmq"
29-
cc: "clang-14"
30-
flags: "-Os -fPIE"
29+
cc: "clang-15"
30+
flags: "-Og -fPIE"
3131
options: "--enable-isystem"
3232
packager: "apt"
3333
packages: ""
3434

3535
- os: ubuntu-22.04
36-
cxx: "clang++-14"
36+
cxx: "clang++-15"
3737
link: "static"
3838
optimization: "size"
3939
assert: "ndebug"
4040
coverage: "nocov"
4141
boost: "--build-boost"
4242
icu: "--build-icu --with-icu"
4343
zmq: "--build-zmq"
44-
cc: "clang-14"
44+
cc: "clang-15"
4545
flags: "-Os -fPIE"
4646
options: "--enable-isystem"
4747
packager: "apt"
@@ -65,43 +65,43 @@ jobs:
6565
- os: ubuntu-22.04
6666
cxx: "g++-11"
6767
link: "static"
68-
optimization: "debug"
68+
optimization: "size"
6969
assert: "ndebug"
7070
coverage: "nocov"
7171
boost: "--build-boost"
7272
icu: "--build-icu --with-icu"
7373
zmq: "--build-zmq"
7474
cc: "gcc-11"
75-
flags: "-Og -fPIE"
75+
flags: "-Os -fPIE"
7676
options: "--enable-isystem"
7777
packager: "apt"
7878
packages: ""
7979

8080
- os: macos-latest
81-
cxx: "clang++-14"
81+
cxx: "clang++"
8282
link: "dynamic"
8383
optimization: "size"
8484
assert: "ndebug"
8585
coverage: "nocov"
8686
boost: "--build-boost"
8787
icu: "--with-icu"
8888
zmq: "--build-zmq"
89-
cc: "clang-14"
89+
cc: "clang"
9090
flags: "-Os -fPIE"
9191
options: "--enable-isystem"
9292
packager: "brew"
9393
packages: "icu4c"
9494

9595
- os: macos-latest
96-
cxx: "clang++-14"
96+
cxx: "clang++"
9797
link: "static"
9898
optimization: "size"
9999
assert: "ndebug"
100100
coverage: "nocov"
101101
boost: "--build-boost"
102102
icu: "--build-icu --with-icu"
103103
zmq: "--build-zmq"
104-
cc: "clang-14"
104+
cc: "clang"
105105
flags: "-Os -fvisibility=hidden -fPIE"
106106
options: "--enable-isystem"
107107
packager: "brew"
@@ -119,7 +119,7 @@ jobs:
119119

120120
steps:
121121
- name: Checkout repository
122-
uses: actions/checkout@v3
122+
uses: actions/checkout@v4
123123

124124
- name: Prepare toolchain [generic]
125125
run: |
@@ -140,7 +140,7 @@ jobs:
140140
shell: bash
141141
run: |
142142
WORKSPACE_SUBPATH="${GITHUB_WORKSPACE%libbitcoin-protocol}"
143-
echo "LIBBITCOIN_SRC_PATH=$WORKSPACE_SUBPATH" >> $GITHUB_ENV
143+
echo "LIBBITCOIN_SRC_PATH=${WORKSPACE_SUBPATH}" >> $GITHUB_ENV
144144
if [[ ${{ matrix.assert }} == 'ndebug' ]]; then
145145
echo "ASSERT_NDEBUG=--enable-ndebug" >> $GITHUB_ENV
146146
else
@@ -152,9 +152,15 @@ jobs:
152152
echo "LINKAGE=--disable-shared" >> $GITHUB_ENV
153153
fi
154154
if [[ ${{ matrix.link }} == 'dynamic' ]]; then
155-
echo "LDFLAGS=-Wl,-rpath,$WORKSPACE_SUBPATH/prefix/lib" >> $GITHUB_ENV
155+
echo "LDFLAGS=-Wl,-rpath,${WORKSPACE_SUBPATH}prefix/lib" >> $GITHUB_ENV
156156
fi
157157
158+
- name: Display Compiler details
159+
shell: bash
160+
run: |
161+
${CC} -v
162+
${CXX} -v
163+
158164
- name: Display CPU details
159165
if: ${{ (runner.os == 'Linux') }}
160166
shell: bash
@@ -164,8 +170,8 @@ jobs:
164170
- name: Execute install.sh
165171
run: >
166172
./install.sh
167-
--build-dir=$LIBBITCOIN_SRC_PATH ${{ matrix.options }}
168-
--prefix=$LIBBITCOIN_SRC_PATH/prefix
173+
--build-dir=${{ env.LIBBITCOIN_SRC_PATH }} ${{ matrix.options }}
174+
--prefix=${{ env.LIBBITCOIN_SRC_PATH }}prefix
169175
${{ env.LINKAGE }}
170176
${{ env.ASSERT_NDEBUG }}
171177
${{ matrix.boost }}
@@ -242,30 +248,30 @@ jobs:
242248
matrix:
243249
include:
244250
- os: ubuntu-22.04
245-
cxx: "clang++-14"
251+
cxx: "clang++-15"
246252
link: "dynamic"
247-
optimization: "size"
253+
optimization: "debug"
248254
assert: "debug"
249255
coverage: "nocov"
250256
boost: "--build-boost"
251257
icu: ""
252258
zmq: "--build-zmq"
253-
cc: "clang-14"
254-
flags: "-Os -fPIE"
259+
cc: "clang-15"
260+
flags: "-Og -fPIE"
255261
options: ""
256262
packager: "apt"
257263
packages: ""
258264

259265
- os: ubuntu-22.04
260-
cxx: "clang++-14"
266+
cxx: "clang++-15"
261267
link: "static"
262268
optimization: "size"
263269
assert: "ndebug"
264270
coverage: "nocov"
265271
boost: "--build-boost"
266272
icu: "--build-icu --with-icu"
267273
zmq: "--build-zmq"
268-
cc: "clang-14"
274+
cc: "clang-15"
269275
flags: "-Os -fPIE"
270276
options: ""
271277
packager: "apt"
@@ -289,43 +295,43 @@ jobs:
289295
- os: ubuntu-22.04
290296
cxx: "g++-11"
291297
link: "static"
292-
optimization: "debug"
298+
optimization: "size"
293299
assert: "ndebug"
294300
coverage: "nocov"
295301
boost: "--build-boost"
296302
icu: "--build-icu --with-icu"
297303
zmq: "--build-zmq"
298304
cc: "gcc-11"
299-
flags: "-Og -fPIE"
305+
flags: "-Os -fPIE"
300306
options: ""
301307
packager: "apt"
302308
packages: ""
303309

304310
- os: macos-latest
305-
cxx: "clang++-14"
311+
cxx: "clang++"
306312
link: "dynamic"
307313
optimization: "size"
308314
assert: "ndebug"
309315
coverage: "nocov"
310316
boost: "--build-boost"
311317
icu: "--with-icu"
312318
zmq: "--build-zmq"
313-
cc: "clang-14"
319+
cc: "clang"
314320
flags: "-Os -fPIE"
315321
options: ""
316322
packager: "brew"
317323
packages: "icu4c"
318324

319325
- os: macos-latest
320-
cxx: "clang++-14"
326+
cxx: "clang++"
321327
link: "static"
322328
optimization: "size"
323329
assert: "ndebug"
324330
coverage: "nocov"
325331
boost: "--build-boost"
326332
icu: "--build-icu --with-icu"
327333
zmq: "--build-zmq"
328-
cc: "clang-14"
334+
cc: "clang"
329335
flags: "-Os -fvisibility=hidden -fPIE"
330336
options: ""
331337
packager: "brew"
@@ -343,7 +349,7 @@ jobs:
343349

344350
steps:
345351
- name: Checkout repository
346-
uses: actions/checkout@v3
352+
uses: actions/checkout@v4
347353

348354
- name: Prepare toolchain [generic]
349355
run: |
@@ -364,7 +370,7 @@ jobs:
364370
shell: bash
365371
run: |
366372
WORKSPACE_SUBPATH="${GITHUB_WORKSPACE%libbitcoin-protocol}"
367-
echo "LIBBITCOIN_SRC_PATH=$WORKSPACE_SUBPATH" >> $GITHUB_ENV
373+
echo "LIBBITCOIN_SRC_PATH=${WORKSPACE_SUBPATH}" >> $GITHUB_ENV
368374
if [[ ${{ matrix.packager }} == 'brew' ]]; then
369375
echo "CMAKE_LIBRARY_PATH=/usr/local/lib" >> $GITHUB_ENV
370376
fi
@@ -379,9 +385,15 @@ jobs:
379385
echo "LINKAGE=--disable-shared" >> $GITHUB_ENV
380386
fi
381387
if [[ ${{ matrix.link }} == 'dynamic' ]]; then
382-
echo "LDFLAGS=-Wl,-rpath,$WORKSPACE_SUBPATH/prefix/lib" >> $GITHUB_ENV
388+
echo "LDFLAGS=-Wl,-rpath,${WORKSPACE_SUBPATH}prefix/lib" >> $GITHUB_ENV
383389
fi
384390
391+
- name: Display Compiler details
392+
shell: bash
393+
run: |
394+
${CC} -v
395+
${CXX} -v
396+
385397
- name: Display CPU details
386398
if: ${{ (runner.os == 'Linux') }}
387399
shell: bash
@@ -391,8 +403,8 @@ jobs:
391403
- name: Execute install-cmake.sh
392404
run: >
393405
./install-cmake.sh
394-
--build-dir=$LIBBITCOIN_SRC_PATH ${{ matrix.options }}
395-
--prefix=$LIBBITCOIN_SRC_PATH/prefix
406+
--build-dir=${{ env.LIBBITCOIN_SRC_PATH }} ${{ matrix.options }}
407+
--prefix=${{ env.LIBBITCOIN_SRC_PATH }}prefix
396408
${{ env.LINKAGE }}
397409
${{ env.ASSERT_NDEBUG }}
398410
${{ matrix.boost }}
@@ -480,31 +492,31 @@ jobs:
480492
include:
481493
- os: ubuntu-22.04
482494
preset: "nix-gnu-debug-shared"
483-
cxx: "clang++-14"
495+
cxx: "clang++-15"
484496
link: "dynamic"
485-
optimization: "size"
497+
optimization: "debug"
486498
assert: "debug"
487499
coverage: "nocov"
488500
boost: "--build-boost"
489501
icu: ""
490502
zmq: "--build-zmq"
491-
cc: "clang-14"
492-
flags: "-Os -fPIE"
503+
cc: "clang-15"
504+
flags: "-Og -fPIE"
493505
options: ""
494506
packager: "apt"
495507
packages: ""
496508

497509
- os: ubuntu-22.04
498510
preset: "nix-gnu-release-static-size"
499-
cxx: "clang++-14"
511+
cxx: "clang++-15"
500512
link: "static"
501513
optimization: "size"
502514
assert: "ndebug"
503515
coverage: "nocov"
504516
boost: "--build-boost"
505517
icu: "--build-icu --with-icu"
506518
zmq: "--build-zmq"
507-
cc: "clang-14"
519+
cc: "clang-15"
508520
flags: "-Os -fPIE"
509521
options: ""
510522
packager: "apt"
@@ -538,7 +550,7 @@ jobs:
538550

539551
steps:
540552
- name: Checkout repository
541-
uses: actions/checkout@v3
553+
uses: actions/checkout@v4
542554

543555
- name: Prepare toolchain [generic]
544556
run: |
@@ -559,7 +571,7 @@ jobs:
559571
shell: bash
560572
run: |
561573
WORKSPACE_SUBPATH="${GITHUB_WORKSPACE%libbitcoin-protocol}"
562-
echo "LIBBITCOIN_SRC_PATH=$WORKSPACE_SUBPATH" >> $GITHUB_ENV
574+
echo "LIBBITCOIN_SRC_PATH=${WORKSPACE_SUBPATH}" >> $GITHUB_ENV
563575
if [[ ${{ matrix.packager }} == 'brew' ]]; then
564576
echo "CMAKE_LIBRARY_PATH=/usr/local/lib" >> $GITHUB_ENV
565577
fi
@@ -574,9 +586,15 @@ jobs:
574586
echo "LINKAGE=--disable-shared" >> $GITHUB_ENV
575587
fi
576588
if [[ ${{ matrix.link }} == 'dynamic' ]]; then
577-
echo "LDFLAGS=-Wl,-rpath,$WORKSPACE_SUBPATH/prefix/${{ matrix.preset }}/lib" >> $GITHUB_ENV
589+
echo "LDFLAGS=-Wl,-rpath,${WORKSPACE_SUBPATH}prefix/${{ matrix.preset }}/lib" >> $GITHUB_ENV
578590
fi
579591
592+
- name: Display Compiler details
593+
shell: bash
594+
run: |
595+
${CC} -v
596+
${CXX} -v
597+
580598
- name: Display CPU details
581599
if: ${{ (runner.os == 'Linux') }}
582600
shell: bash
@@ -586,8 +604,8 @@ jobs:
586604
- name: Execute install-cmakepresets.sh
587605
run: >
588606
./install-cmakepresets.sh
589-
--build-dir=$LIBBITCOIN_SRC_PATH ${{ matrix.options }}
590-
--prefix=$LIBBITCOIN_SRC_PATH/prefix/${{ matrix.preset }}
607+
--build-dir=${{ env.LIBBITCOIN_SRC_PATH }} ${{ matrix.options }}
608+
--prefix=${{ env.LIBBITCOIN_SRC_PATH }}prefix/${{ matrix.preset }}
591609
--preset=${{ matrix.preset }}
592610
${{ env.LINKAGE }}
593611
${{ env.ASSERT_NDEBUG }}
@@ -706,7 +724,7 @@ jobs:
706724
msbuild-architecture: x64
707725

708726
- name: Checkout repository
709-
uses: actions/checkout@v3
727+
uses: actions/checkout@v4
710728

711729
- name: Initialize SDK
712730
shell: powershell

0 commit comments

Comments
 (0)