Skip to content

Commit 64e94cb

Browse files
pmienkpmienk
authored
Merge pull request #268 from pmienk/master
Regenerate artifacts with macos-13.
2 parents a81d154 + 2736463 commit 64e94cb

File tree

4 files changed

+37
-34
lines changed

4 files changed

+37
-34
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ jobs:
7777
packager: "apt"
7878
packages: ""
7979

80-
- os: macos-latest
80+
- os: macos-13
8181
cxx: "clang++"
8282
link: "dynamic"
8383
optimization: "size"
@@ -87,12 +87,12 @@ jobs:
8787
icu: "--with-icu"
8888
zmq: "--build-zmq"
8989
cc: "clang"
90-
flags: "-Os -fPIE"
90+
flags: "-Os -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE"
9191
options: "--enable-isystem"
9292
packager: "brew"
9393
packages: "icu4c"
9494

95-
- os: macos-latest
95+
- os: macos-13
9696
cxx: "clang++"
9797
link: "static"
9898
optimization: "size"
@@ -102,7 +102,7 @@ jobs:
102102
icu: "--build-icu --with-icu"
103103
zmq: "--build-zmq"
104104
cc: "clang"
105-
flags: "-Os -fvisibility=hidden -fPIE"
105+
flags: "-Os -fvisibility=hidden -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE"
106106
options: "--enable-isystem"
107107
packager: "brew"
108108
packages: ""
@@ -187,7 +187,7 @@ jobs:
187187
188188
- name: Coveralls.io Upload
189189
if: ${{ matrix.coverage == 'cov' }}
190-
uses: coverallsapp/github-action@v2.2.3
190+
uses: coverallsapp/github-action@v2.3.0
191191
with:
192192
format: lcov
193193
files: "./coverage.info"
@@ -227,11 +227,12 @@ jobs:
227227
228228
229229
- name: Failure display otool output
230-
if: ${{ failure() && (matrix.os == 'macos-latest') }}
230+
if: ${{ failure() && startsWith(matrix.os, 'macos') }}
231231
run: |
232232
otool -L ${{ github.workspace }}/test/.libs/libbitcoin-protocol-test
233+
233234
- name: Failure display DYLD_PRINT_LIBRARIES
234-
if: ${{ failure() && (matrix.os == 'macos-latest') }}
235+
if: ${{ failure() && startsWith(matrix.os, 'macos') }}
235236
run: |
236237
DYLD_PRINT_LIBRARIES=1 ${{ github.workspace }}/test/.libs/libbitcoin-protocol-test
237238
@@ -308,7 +309,7 @@ jobs:
308309
packager: "apt"
309310
packages: ""
310311

311-
- os: macos-latest
312+
- os: macos-13
312313
cxx: "clang++"
313314
link: "dynamic"
314315
optimization: "size"
@@ -318,12 +319,12 @@ jobs:
318319
icu: "--with-icu"
319320
zmq: "--build-zmq"
320321
cc: "clang"
321-
flags: "-Os -fPIE"
322+
flags: "-Os -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE"
322323
options: ""
323324
packager: "brew"
324325
packages: "icu4c"
325326

326-
- os: macos-latest
327+
- os: macos-13
327328
cxx: "clang++"
328329
link: "static"
329330
optimization: "size"
@@ -333,7 +334,7 @@ jobs:
333334
icu: "--build-icu --with-icu"
334335
zmq: "--build-zmq"
335336
cc: "clang"
336-
flags: "-Os -fvisibility=hidden -fPIE"
337+
flags: "-Os -fvisibility=hidden -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE"
337338
options: ""
338339
packager: "brew"
339340
packages: ""
@@ -421,7 +422,7 @@ jobs:
421422
422423
- name: Coveralls.io Upload
423424
if: ${{ matrix.coverage == 'cov' }}
424-
uses: coverallsapp/github-action@v2.2.3
425+
uses: coverallsapp/github-action@v2.3.0
425426
with:
426427
format: lcov
427428
files: "./coverage.info"
@@ -461,11 +462,12 @@ jobs:
461462
462463
463464
- name: Failure display otool output
464-
if: ${{ failure() && (matrix.os == 'macos-latest') }}
465+
if: ${{ failure() && startsWith(matrix.os, 'macos') }}
465466
run: |
466467
otool -L ${{ github.workspace }}/test/.libs/libbitcoin-protocol-test
468+
467469
- name: Failure display DYLD_PRINT_LIBRARIES
468-
if: ${{ failure() && (matrix.os == 'macos-latest') }}
470+
if: ${{ failure() && startsWith(matrix.os, 'macos') }}
469471
run: |
470472
DYLD_PRINT_LIBRARIES=1 ${{ github.workspace }}/test/.libs/libbitcoin-protocol-test
471473
@@ -624,7 +626,7 @@ jobs:
624626
625627
- name: Coveralls.io Upload
626628
if: ${{ matrix.coverage == 'cov' }}
627-
uses: coverallsapp/github-action@v2.2.3
629+
uses: coverallsapp/github-action@v2.3.0
628630
with:
629631
format: lcov
630632
files: "./coverage.info"
@@ -664,11 +666,12 @@ jobs:
664666
665667
666668
- name: Failure display otool output
667-
if: ${{ failure() && (matrix.os == 'macos-latest') }}
669+
if: ${{ failure() && startsWith(matrix.os, 'macos') }}
668670
run: |
669671
otool -L ${{ github.workspace }}/test/.libs/libbitcoin-protocol-test
672+
670673
- name: Failure display DYLD_PRINT_LIBRARIES
671-
if: ${{ failure() && (matrix.os == 'macos-latest') }}
674+
if: ${{ failure() && startsWith(matrix.os, 'macos') }}
672675
run: |
673676
DYLD_PRINT_LIBRARIES=1 ${{ github.workspace }}/test/.libs/libbitcoin-protocol-test
674677

‎install-cmake.sh‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -539,7 +539,7 @@ unpack_from_tarball()
539539
local COMPRESSION=$3
540540
local BUILD=$4
541541

542-
display_heading_message "Prepairing to aquire $ARCHIVE"
542+
display_heading_message "Preparing to acquire $ARCHIVE"
543543

544544
if [[ ! ($BUILD) ]]; then
545545
display_message "Skipping unpack of $ARCHIVE..."
@@ -585,7 +585,7 @@ build_from_tarball()
585585
return
586586
fi
587587

588-
display_heading_message "Prepairing to build $ARCHIVE"
588+
display_heading_message "Preparing to build $ARCHIVE"
589589

590590
# Because ICU tools don't know how to locate internal dependencies.
591591
if [[ ($ARCHIVE == "$ICU_ARCHIVE") ]]; then
@@ -643,7 +643,7 @@ create_from_github()
643643

644644
FORK="$ACCOUNT/$REPO"
645645

646-
display_heading_message "Prepairing to aquire $FORK/$BRANCH"
646+
display_heading_message "Preparing to acquire $FORK/$BRANCH"
647647

648648
if [[ -d "$REPO" ]]; then
649649
if [[ true ]]; then
@@ -678,7 +678,7 @@ build_from_github()
678678
# Join generated and command line options.
679679
local CONFIGURATION=("${OPTIONS[@]}" "$@")
680680

681-
display_heading_message "Prepairing to build $REPO"
681+
display_heading_message "Preparing to build $REPO"
682682

683683
# Build the local repository clone.
684684
make_project_directory "$REPO" "$JOBS" "$TEST" "${CONFIGURATION[@]}"
@@ -746,7 +746,7 @@ build_from_github_cmake()
746746
# Join generated and command line options.
747747
local CONFIGURATION=("${OPTIONS[@]}" "$@")
748748

749-
display_heading_message "Prepairing to build $REPO"
749+
display_heading_message "Preparing to build $REPO"
750750

751751
# Build the local repository clone.
752752
cmake_project_directory "$REPO" "$JOBS" "$TEST" "${CONFIGURATION[@]}"
@@ -832,7 +832,7 @@ build_from_tarball_boost()
832832
return
833833
fi
834834

835-
display_heading_message "Prepairing to build $ARCHIVE"
835+
display_heading_message "Preparing to build $ARCHIVE"
836836

837837
local TARGET="build-$ARCHIVE"
838838

‎install-cmakepresets.sh‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -585,7 +585,7 @@ unpack_from_tarball()
585585
local COMPRESSION=$3
586586
local BUILD=$4
587587

588-
display_heading_message "Prepairing to aquire $ARCHIVE"
588+
display_heading_message "Preparing to acquire $ARCHIVE"
589589

590590
if [[ ! ($BUILD) ]]; then
591591
display_message "Skipping unpack of $ARCHIVE..."
@@ -631,7 +631,7 @@ build_from_tarball()
631631
return
632632
fi
633633

634-
display_heading_message "Prepairing to build $ARCHIVE"
634+
display_heading_message "Preparing to build $ARCHIVE"
635635

636636
# Because ICU tools don't know how to locate internal dependencies.
637637
if [[ ($ARCHIVE == "$ICU_ARCHIVE") ]]; then
@@ -689,7 +689,7 @@ create_from_github()
689689

690690
FORK="$ACCOUNT/$REPO"
691691

692-
display_heading_message "Prepairing to aquire $FORK/$BRANCH"
692+
display_heading_message "Preparing to acquire $FORK/$BRANCH"
693693

694694
if [[ -d "$REPO" ]]; then
695695
if [[ true ]]; then
@@ -724,7 +724,7 @@ build_from_github()
724724
# Join generated and command line options.
725725
local CONFIGURATION=("${OPTIONS[@]}" "$@")
726726

727-
display_heading_message "Prepairing to build $REPO"
727+
display_heading_message "Preparing to build $REPO"
728728

729729
# Build the local repository clone.
730730
make_project_directory "$REPO" "$JOBS" "$TEST" "${CONFIGURATION[@]}"
@@ -800,7 +800,7 @@ build_from_github_cmake()
800800
# Join generated and command line options.
801801
local CONFIGURATION=("${OPTIONS[@]}" "$@")
802802

803-
display_heading_message "Prepairing to build $REPO"
803+
display_heading_message "Preparing to build $REPO"
804804

805805
# Build the local repository clone.
806806
cmake_project_directory "$REPO" "$PRESET" "$JOBS" "$TEST" "${CONFIGURATION[@]}"
@@ -886,7 +886,7 @@ build_from_tarball_boost()
886886
return
887887
fi
888888

889-
display_heading_message "Prepairing to build $ARCHIVE"
889+
display_heading_message "Preparing to build $ARCHIVE"
890890

891891
local TARGET="build-$ARCHIVE"
892892

‎install.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@ unpack_from_tarball()
482482
local COMPRESSION=$3
483483
local BUILD=$4
484484

485-
display_heading_message "Prepairing to aquire $ARCHIVE"
485+
display_heading_message "Preparing to acquire $ARCHIVE"
486486

487487
if [[ ! ($BUILD) ]]; then
488488
display_message "Skipping unpack of $ARCHIVE..."
@@ -528,7 +528,7 @@ build_from_tarball()
528528
return
529529
fi
530530

531-
display_heading_message "Prepairing to build $ARCHIVE"
531+
display_heading_message "Preparing to build $ARCHIVE"
532532

533533
# Because ICU tools don't know how to locate internal dependencies.
534534
if [[ ($ARCHIVE == "$ICU_ARCHIVE") ]]; then
@@ -586,7 +586,7 @@ create_from_github()
586586

587587
FORK="$ACCOUNT/$REPO"
588588

589-
display_heading_message "Prepairing to aquire $FORK/$BRANCH"
589+
display_heading_message "Preparing to acquire $FORK/$BRANCH"
590590

591591
if [[ -d "$REPO" ]]; then
592592
if [[ true ]]; then
@@ -621,7 +621,7 @@ build_from_github()
621621
# Join generated and command line options.
622622
local CONFIGURATION=("${OPTIONS[@]}" "$@")
623623

624-
display_heading_message "Prepairing to build $REPO"
624+
display_heading_message "Preparing to build $REPO"
625625

626626
# Build the local repository clone.
627627
make_project_directory "$REPO" "$JOBS" "$TEST" "${CONFIGURATION[@]}"
@@ -707,7 +707,7 @@ build_from_tarball_boost()
707707
return
708708
fi
709709

710-
display_heading_message "Prepairing to build $ARCHIVE"
710+
display_heading_message "Preparing to build $ARCHIVE"
711711

712712
local TARGET="build-$ARCHIVE"
713713

0 commit comments

Comments
 (0)