Skip to content

Commit c5ec91b

Browse files
pmienkpmienk
committed
Regenerate with CI macos-latest.
1 parent 83818ca commit c5ec91b

File tree

4 files changed

+31
-36
lines changed

4 files changed

+31
-36
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -73,33 +73,33 @@ jobs:
7373
packager: "apt"
7474
packages: "lcov"
7575

76-
- os: macos-13
76+
- os: macos-latest
7777
cxx: "clang++"
7878
link: "dynamic"
7979
optimization: "size"
8080
assert: "ndebug"
8181
coverage: "nocov"
8282
boost: "--build-boost"
83-
icu: "--with-icu"
83+
icu: ""
8484
cc: "clang"
8585
flags: "-Os -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE"
8686
options: "--enable-isystem"
8787
packager: "brew"
8888
packages: "icu4c"
8989

90-
- os: macos-13
90+
- os: macos-latest
9191
cxx: "clang++"
9292
link: "static"
9393
optimization: "size"
9494
assert: "ndebug"
9595
coverage: "nocov"
9696
boost: "--build-boost"
97-
icu: "--build-icu --with-icu"
97+
icu: ""
9898
cc: "clang"
9999
flags: "-Os -fvisibility=hidden -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE"
100100
options: "--enable-isystem"
101101
packager: "brew"
102-
packages: ""
102+
packages: "icu4c"
103103

104104

105105
runs-on: ${{ matrix.os }}
@@ -180,7 +180,7 @@ jobs:
180180
181181
- name: Coveralls.io Upload
182182
if: ${{ matrix.coverage == 'cov' }}
183-
uses: coverallsapp/github-action@v2.2.3
183+
uses: coverallsapp/github-action@v2.3.0
184184
with:
185185
format: lcov
186186
files: "./coverage.info"
@@ -298,33 +298,33 @@ jobs:
298298
packager: "apt"
299299
packages: ""
300300

301-
- os: macos-13
301+
- os: macos-latest
302302
cxx: "clang++"
303303
link: "dynamic"
304304
optimization: "size"
305305
assert: "ndebug"
306306
coverage: "nocov"
307307
boost: "--build-boost"
308-
icu: "--with-icu"
308+
icu: ""
309309
cc: "clang"
310310
flags: "-Os -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE"
311311
options: ""
312312
packager: "brew"
313313
packages: "icu4c"
314314

315-
- os: macos-13
315+
- os: macos-latest
316316
cxx: "clang++"
317317
link: "static"
318318
optimization: "size"
319319
assert: "ndebug"
320320
coverage: "nocov"
321321
boost: "--build-boost"
322-
icu: "--build-icu --with-icu"
322+
icu: ""
323323
cc: "clang"
324324
flags: "-Os -fvisibility=hidden -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE"
325325
options: ""
326326
packager: "brew"
327-
packages: ""
327+
packages: "icu4c"
328328

329329

330330
runs-on: ${{ matrix.os }}
@@ -408,7 +408,7 @@ jobs:
408408
409409
- name: Coveralls.io Upload
410410
if: ${{ matrix.coverage == 'cov' }}
411-
uses: coverallsapp/github-action@v2.2.3
411+
uses: coverallsapp/github-action@v2.3.0
412412
with:
413413
format: lcov
414414
files: "./coverage.info"
@@ -608,7 +608,7 @@ jobs:
608608
609609
- name: Coveralls.io Upload
610610
if: ${{ matrix.coverage == 'cov' }}
611-
uses: coverallsapp/github-action@v2.2.3
611+
uses: coverallsapp/github-action@v2.3.0
612612
with:
613613
format: lcov
614614
files: "./coverage.info"

‎install-cmake.sh‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -510,7 +510,7 @@ unpack_from_tarball()
510510
local COMPRESSION=$3
511511
local BUILD=$4
512512

513-
display_heading_message "Prepairing to aquire $ARCHIVE"
513+
display_heading_message "Preparing to acquire $ARCHIVE"
514514

515515
if [[ ! ($BUILD) ]]; then
516516
display_message "Skipping unpack of $ARCHIVE..."
@@ -556,7 +556,7 @@ build_from_tarball()
556556
return
557557
fi
558558

559-
display_heading_message "Prepairing to build $ARCHIVE"
559+
display_heading_message "Preparing to build $ARCHIVE"
560560

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

615615
FORK="$ACCOUNT/$REPO"
616616

617-
display_heading_message "Prepairing to aquire $FORK/$BRANCH"
617+
display_heading_message "Preparing to acquire $FORK/$BRANCH"
618618

619619
if [[ -d "$REPO" ]]; then
620620
if [[ true ]]; then
@@ -649,7 +649,7 @@ build_from_github()
649649
# Join generated and command line options.
650650
local CONFIGURATION=("${OPTIONS[@]}" "$@")
651651

652-
display_heading_message "Prepairing to build $REPO"
652+
display_heading_message "Preparing to build $REPO"
653653

654654
# Build the local repository clone.
655655
make_project_directory "$REPO" "$JOBS" "$TEST" "${CONFIGURATION[@]}"
@@ -717,7 +717,7 @@ build_from_github_cmake()
717717
# Join generated and command line options.
718718
local CONFIGURATION=("${OPTIONS[@]}" "$@")
719719

720-
display_heading_message "Prepairing to build $REPO"
720+
display_heading_message "Preparing to build $REPO"
721721

722722
# Build the local repository clone.
723723
cmake_project_directory "$REPO" "$JOBS" "$TEST" "${CONFIGURATION[@]}"
@@ -803,7 +803,7 @@ build_from_tarball_boost()
803803
return
804804
fi
805805

806-
display_heading_message "Prepairing to build $ARCHIVE"
806+
display_heading_message "Preparing to build $ARCHIVE"
807807

808808
local TARGET="build-$ARCHIVE"
809809

‎install-cmakepresets.sh‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -547,7 +547,7 @@ unpack_from_tarball()
547547
local COMPRESSION=$3
548548
local BUILD=$4
549549

550-
display_heading_message "Prepairing to aquire $ARCHIVE"
550+
display_heading_message "Preparing to acquire $ARCHIVE"
551551

552552
if [[ ! ($BUILD) ]]; then
553553
display_message "Skipping unpack of $ARCHIVE..."
@@ -593,7 +593,7 @@ build_from_tarball()
593593
return
594594
fi
595595

596-
display_heading_message "Prepairing to build $ARCHIVE"
596+
display_heading_message "Preparing to build $ARCHIVE"
597597

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

652652
FORK="$ACCOUNT/$REPO"
653653

654-
display_heading_message "Prepairing to aquire $FORK/$BRANCH"
654+
display_heading_message "Preparing to acquire $FORK/$BRANCH"
655655

656656
if [[ -d "$REPO" ]]; then
657657
if [[ true ]]; then
@@ -686,7 +686,7 @@ build_from_github()
686686
# Join generated and command line options.
687687
local CONFIGURATION=("${OPTIONS[@]}" "$@")
688688

689-
display_heading_message "Prepairing to build $REPO"
689+
display_heading_message "Preparing to build $REPO"
690690

691691
# Build the local repository clone.
692692
make_project_directory "$REPO" "$JOBS" "$TEST" "${CONFIGURATION[@]}"
@@ -700,14 +700,9 @@ cmake_tests()
700700

701701
# Build and run unit tests relative to the primary directory.
702702
# VERBOSE=1 ensures test runner output sent to console (gcc).
703-
make -j"$JOBS" test "VERBOSE=1"
703+
CTEST_OUTPUT_ON_FAILURE=ON make -j"$JOBS" test "VERBOSE=1"
704704
local RESULT=$?
705705

706-
# Test runners emit to the test.log file.
707-
if [[ -e "test.log" ]]; then
708-
cat "test.log"
709-
fi
710-
711706
if [[ $RESULT -ne 0 ]]; then
712707
exit $RESULT
713708
fi
@@ -762,7 +757,7 @@ build_from_github_cmake()
762757
# Join generated and command line options.
763758
local CONFIGURATION=("${OPTIONS[@]}" "$@")
764759

765-
display_heading_message "Prepairing to build $REPO"
760+
display_heading_message "Preparing to build $REPO"
766761

767762
# Build the local repository clone.
768763
cmake_project_directory "$REPO" "$PRESET" "$JOBS" "$TEST" "${CONFIGURATION[@]}"
@@ -848,7 +843,7 @@ build_from_tarball_boost()
848843
return
849844
fi
850845

851-
display_heading_message "Prepairing to build $ARCHIVE"
846+
display_heading_message "Preparing to build $ARCHIVE"
852847

853848
local TARGET="build-$ARCHIVE"
854849

‎install.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ unpack_from_tarball()
450450
local COMPRESSION=$3
451451
local BUILD=$4
452452

453-
display_heading_message "Prepairing to aquire $ARCHIVE"
453+
display_heading_message "Preparing to acquire $ARCHIVE"
454454

455455
if [[ ! ($BUILD) ]]; then
456456
display_message "Skipping unpack of $ARCHIVE..."
@@ -496,7 +496,7 @@ build_from_tarball()
496496
return
497497
fi
498498

499-
display_heading_message "Prepairing to build $ARCHIVE"
499+
display_heading_message "Preparing to build $ARCHIVE"
500500

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

555555
FORK="$ACCOUNT/$REPO"
556556

557-
display_heading_message "Prepairing to aquire $FORK/$BRANCH"
557+
display_heading_message "Preparing to acquire $FORK/$BRANCH"
558558

559559
if [[ -d "$REPO" ]]; then
560560
if [[ true ]]; then
@@ -589,7 +589,7 @@ build_from_github()
589589
# Join generated and command line options.
590590
local CONFIGURATION=("${OPTIONS[@]}" "$@")
591591

592-
display_heading_message "Prepairing to build $REPO"
592+
display_heading_message "Preparing to build $REPO"
593593

594594
# Build the local repository clone.
595595
make_project_directory "$REPO" "$JOBS" "$TEST" "${CONFIGURATION[@]}"
@@ -675,7 +675,7 @@ build_from_tarball_boost()
675675
return
676676
fi
677677

678-
display_heading_message "Prepairing to build $ARCHIVE"
678+
display_heading_message "Preparing to build $ARCHIVE"
679679

680680
local TARGET="build-$ARCHIVE"
681681

0 commit comments

Comments
 (0)