From c5ec91bc14f84569f6c2eb6fafaa6f54bdb0511f Mon Sep 17 00:00:00 2001 From: Phillip Mienk Date: Thu, 23 May 2024 19:09:45 -0700 Subject: [PATCH] Regenerate with CI macos-latest. --- .github/workflows/ci.yml | 26 +++++++++++++------------- install-cmake.sh | 12 ++++++------ install-cmakepresets.sh | 19 +++++++------------ install.sh | 10 +++++----- 4 files changed, 31 insertions(+), 36 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 890966a2..333b85fb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -73,33 +73,33 @@ jobs: packager: "apt" packages: "lcov" - - os: macos-13 + - os: macos-latest cxx: "clang++" link: "dynamic" optimization: "size" assert: "ndebug" coverage: "nocov" boost: "--build-boost" - icu: "--with-icu" + icu: "" cc: "clang" flags: "-Os -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE" options: "--enable-isystem" packager: "brew" packages: "icu4c" - - os: macos-13 + - os: macos-latest cxx: "clang++" link: "static" optimization: "size" assert: "ndebug" coverage: "nocov" boost: "--build-boost" - icu: "--build-icu --with-icu" + icu: "" cc: "clang" flags: "-Os -fvisibility=hidden -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE" options: "--enable-isystem" packager: "brew" - packages: "" + packages: "icu4c" runs-on: ${{ matrix.os }} @@ -180,7 +180,7 @@ jobs: - name: Coveralls.io Upload if: ${{ matrix.coverage == 'cov' }} - uses: coverallsapp/github-action@v2.2.3 + uses: coverallsapp/github-action@v2.3.0 with: format: lcov files: "./coverage.info" @@ -298,33 +298,33 @@ jobs: packager: "apt" packages: "" - - os: macos-13 + - os: macos-latest cxx: "clang++" link: "dynamic" optimization: "size" assert: "ndebug" coverage: "nocov" boost: "--build-boost" - icu: "--with-icu" + icu: "" cc: "clang" flags: "-Os -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE" options: "" packager: "brew" packages: "icu4c" - - os: macos-13 + - os: macos-latest cxx: "clang++" link: "static" optimization: "size" assert: "ndebug" coverage: "nocov" boost: "--build-boost" - icu: "--build-icu --with-icu" + icu: "" cc: "clang" flags: "-Os -fvisibility=hidden -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE" options: "" packager: "brew" - packages: "" + packages: "icu4c" runs-on: ${{ matrix.os }} @@ -408,7 +408,7 @@ jobs: - name: Coveralls.io Upload if: ${{ matrix.coverage == 'cov' }} - uses: coverallsapp/github-action@v2.2.3 + uses: coverallsapp/github-action@v2.3.0 with: format: lcov files: "./coverage.info" @@ -608,7 +608,7 @@ jobs: - name: Coveralls.io Upload if: ${{ matrix.coverage == 'cov' }} - uses: coverallsapp/github-action@v2.2.3 + uses: coverallsapp/github-action@v2.3.0 with: format: lcov files: "./coverage.info" diff --git a/install-cmake.sh b/install-cmake.sh index 8c5201bf..5b9708da 100755 --- a/install-cmake.sh +++ b/install-cmake.sh @@ -510,7 +510,7 @@ unpack_from_tarball() local COMPRESSION=$3 local BUILD=$4 - display_heading_message "Prepairing to aquire $ARCHIVE" + display_heading_message "Preparing to acquire $ARCHIVE" if [[ ! ($BUILD) ]]; then display_message "Skipping unpack of $ARCHIVE..." @@ -556,7 +556,7 @@ build_from_tarball() return fi - display_heading_message "Prepairing to build $ARCHIVE" + display_heading_message "Preparing to build $ARCHIVE" # Because ICU tools don't know how to locate internal dependencies. if [[ ($ARCHIVE == "$ICU_ARCHIVE") ]]; then @@ -614,7 +614,7 @@ create_from_github() FORK="$ACCOUNT/$REPO" - display_heading_message "Prepairing to aquire $FORK/$BRANCH" + display_heading_message "Preparing to acquire $FORK/$BRANCH" if [[ -d "$REPO" ]]; then if [[ true ]]; then @@ -649,7 +649,7 @@ build_from_github() # Join generated and command line options. local CONFIGURATION=("${OPTIONS[@]}" "$@") - display_heading_message "Prepairing to build $REPO" + display_heading_message "Preparing to build $REPO" # Build the local repository clone. make_project_directory "$REPO" "$JOBS" "$TEST" "${CONFIGURATION[@]}" @@ -717,7 +717,7 @@ build_from_github_cmake() # Join generated and command line options. local CONFIGURATION=("${OPTIONS[@]}" "$@") - display_heading_message "Prepairing to build $REPO" + display_heading_message "Preparing to build $REPO" # Build the local repository clone. cmake_project_directory "$REPO" "$JOBS" "$TEST" "${CONFIGURATION[@]}" @@ -803,7 +803,7 @@ build_from_tarball_boost() return fi - display_heading_message "Prepairing to build $ARCHIVE" + display_heading_message "Preparing to build $ARCHIVE" local TARGET="build-$ARCHIVE" diff --git a/install-cmakepresets.sh b/install-cmakepresets.sh index 087a32eb..b1d61f1b 100755 --- a/install-cmakepresets.sh +++ b/install-cmakepresets.sh @@ -547,7 +547,7 @@ unpack_from_tarball() local COMPRESSION=$3 local BUILD=$4 - display_heading_message "Prepairing to aquire $ARCHIVE" + display_heading_message "Preparing to acquire $ARCHIVE" if [[ ! ($BUILD) ]]; then display_message "Skipping unpack of $ARCHIVE..." @@ -593,7 +593,7 @@ build_from_tarball() return fi - display_heading_message "Prepairing to build $ARCHIVE" + display_heading_message "Preparing to build $ARCHIVE" # Because ICU tools don't know how to locate internal dependencies. if [[ ($ARCHIVE == "$ICU_ARCHIVE") ]]; then @@ -651,7 +651,7 @@ create_from_github() FORK="$ACCOUNT/$REPO" - display_heading_message "Prepairing to aquire $FORK/$BRANCH" + display_heading_message "Preparing to acquire $FORK/$BRANCH" if [[ -d "$REPO" ]]; then if [[ true ]]; then @@ -686,7 +686,7 @@ build_from_github() # Join generated and command line options. local CONFIGURATION=("${OPTIONS[@]}" "$@") - display_heading_message "Prepairing to build $REPO" + display_heading_message "Preparing to build $REPO" # Build the local repository clone. make_project_directory "$REPO" "$JOBS" "$TEST" "${CONFIGURATION[@]}" @@ -700,14 +700,9 @@ cmake_tests() # Build and run unit tests relative to the primary directory. # VERBOSE=1 ensures test runner output sent to console (gcc). - make -j"$JOBS" test "VERBOSE=1" + CTEST_OUTPUT_ON_FAILURE=ON make -j"$JOBS" test "VERBOSE=1" local RESULT=$? - # Test runners emit to the test.log file. - if [[ -e "test.log" ]]; then - cat "test.log" - fi - if [[ $RESULT -ne 0 ]]; then exit $RESULT fi @@ -762,7 +757,7 @@ build_from_github_cmake() # Join generated and command line options. local CONFIGURATION=("${OPTIONS[@]}" "$@") - display_heading_message "Prepairing to build $REPO" + display_heading_message "Preparing to build $REPO" # Build the local repository clone. cmake_project_directory "$REPO" "$PRESET" "$JOBS" "$TEST" "${CONFIGURATION[@]}" @@ -848,7 +843,7 @@ build_from_tarball_boost() return fi - display_heading_message "Prepairing to build $ARCHIVE" + display_heading_message "Preparing to build $ARCHIVE" local TARGET="build-$ARCHIVE" diff --git a/install.sh b/install.sh index f8d80ab4..3d19465c 100755 --- a/install.sh +++ b/install.sh @@ -450,7 +450,7 @@ unpack_from_tarball() local COMPRESSION=$3 local BUILD=$4 - display_heading_message "Prepairing to aquire $ARCHIVE" + display_heading_message "Preparing to acquire $ARCHIVE" if [[ ! ($BUILD) ]]; then display_message "Skipping unpack of $ARCHIVE..." @@ -496,7 +496,7 @@ build_from_tarball() return fi - display_heading_message "Prepairing to build $ARCHIVE" + display_heading_message "Preparing to build $ARCHIVE" # Because ICU tools don't know how to locate internal dependencies. if [[ ($ARCHIVE == "$ICU_ARCHIVE") ]]; then @@ -554,7 +554,7 @@ create_from_github() FORK="$ACCOUNT/$REPO" - display_heading_message "Prepairing to aquire $FORK/$BRANCH" + display_heading_message "Preparing to acquire $FORK/$BRANCH" if [[ -d "$REPO" ]]; then if [[ true ]]; then @@ -589,7 +589,7 @@ build_from_github() # Join generated and command line options. local CONFIGURATION=("${OPTIONS[@]}" "$@") - display_heading_message "Prepairing to build $REPO" + display_heading_message "Preparing to build $REPO" # Build the local repository clone. make_project_directory "$REPO" "$JOBS" "$TEST" "${CONFIGURATION[@]}" @@ -675,7 +675,7 @@ build_from_tarball_boost() return fi - display_heading_message "Prepairing to build $ARCHIVE" + display_heading_message "Preparing to build $ARCHIVE" local TARGET="build-$ARCHIVE"