From 6789eee65a2cf5590641987f3c6ac2bcd4a37f8b Mon Sep 17 00:00:00 2001 From: Alan Jowett Date: Mon, 20 May 2024 21:01:50 -0700 Subject: [PATCH] Update to macos-latest (#482) Signed-off-by: Alan Jowett Co-authored-by: Alan Jowett --- .github/workflows/fuzzing.yml | 2 +- .github/workflows/main.yml | 24 ++++++++++++------------ .github/workflows/posix.yml | 8 ++++---- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/fuzzing.yml b/.github/workflows/fuzzing.yml index a7597b734..219ed9b4c 100644 --- a/.github/workflows/fuzzing.yml +++ b/.github/workflows/fuzzing.yml @@ -75,7 +75,7 @@ jobs: shell: bash - name: Install system dependencies (macOS) - if: matrix.platform == 'macos-11' + if: matrix.platform == 'macos-latest' run: | brew install \ cmake \ diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 06f19d216..72f5d1550 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -66,7 +66,7 @@ jobs: uses: ./.github/workflows/posix.yml with: arch: x86_64 - platform: macos-11 + platform: macos-latest build_type: RelWithDebInfo upload_packages: true @@ -74,7 +74,7 @@ jobs: uses: ./.github/workflows/posix.yml with: arch: x86_64 - platform: macos-11 + platform: macos-latest build_type: RelWithDebInfo upload_packages: true disable_retpolines: true @@ -83,7 +83,7 @@ jobs: uses: ./.github/workflows/posix.yml with: arch: x86_64 - platform: macos-11 + platform: macos-latest build_type: RelWithDebInfo enable_coverage: true @@ -91,7 +91,7 @@ jobs: uses: ./.github/workflows/posix.yml with: arch: x86_64 - platform: macos-11 + platform: macos-latest build_type: RelWithDebInfo enable_coverage: true disable_retpolines: true @@ -100,7 +100,7 @@ jobs: uses: ./.github/workflows/posix.yml with: arch: x86_64 - platform: macos-11 + platform: macos-latest build_type: RelWithDebInfo enable_sanitizers: true @@ -108,7 +108,7 @@ jobs: uses: ./.github/workflows/posix.yml with: arch: x86_64 - platform: macos-11 + platform: macos-latest build_type: RelWithDebInfo enable_sanitizers: true disable_retpolines: true @@ -118,14 +118,14 @@ jobs: uses: ./.github/workflows/posix.yml with: arch: x86_64 - platform: macos-11 + platform: macos-latest build_type: Debug macos_debug_no_retpolines: uses: ./.github/workflows/posix.yml with: arch: x86_64 - platform: macos-11 + platform: macos-latest build_type: Debug disable_retpolines: true @@ -134,7 +134,7 @@ jobs: uses: ./.github/workflows/posix.yml with: arch: x86_64 - platform: macos-11 + platform: macos-latest build_type: Debug enable_coverage: true @@ -142,7 +142,7 @@ jobs: uses: ./.github/workflows/posix.yml with: arch: x86_64 - platform: macos-11 + platform: macos-latest build_type: Debug enable_coverage: true disable_retpolines: true @@ -151,7 +151,7 @@ jobs: uses: ./.github/workflows/posix.yml with: arch: x86_64 - platform: macos-11 + platform: macos-latest build_type: Debug enable_sanitizers: true @@ -159,7 +159,7 @@ jobs: uses: ./.github/workflows/posix.yml with: arch: x86_64 - platform: macos-11 + platform: macos-latest build_type: Debug enable_sanitizers: true disable_retpolines: true diff --git a/.github/workflows/posix.yml b/.github/workflows/posix.yml index 549b54205..cfac99776 100644 --- a/.github/workflows/posix.yml +++ b/.github/workflows/posix.yml @@ -123,7 +123,7 @@ jobs: shell: bash - name: Install system dependencies (macOS) - if: inputs.platform == 'macos-11' + if: inputs.platform == 'macos-latest' run: | brew install \ cmake \ @@ -192,13 +192,13 @@ jobs: --target test - name: Generate code coverage report - if: inputs.enable_coverage == true && inputs.platform == 'macos-11' + if: inputs.enable_coverage == true && inputs.platform == 'macos-latest' run: | mkdir -p coverage lcov --capture --directory build --include '${{env.GITHUB_WORKSPACE}}/*' --output-file coverage/lcov.info --ignore-errors inconsistent - name: Generate code coverage report - if: inputs.enable_coverage == true && inputs.platform != 'macos-11' + if: inputs.enable_coverage == true && inputs.platform != 'macos-latest' run: | mkdir -p coverage lcov --capture --directory build --include '${{env.GITHUB_WORKSPACE}}/*' --output-file coverage/lcov.info @@ -291,7 +291,7 @@ jobs: retention-days: 5 - name: Upload the macOS TGZ package - if: inputs.upload_packages == true && inputs.platform == 'macos-11' + if: inputs.upload_packages == true && inputs.platform == 'macos-latest' uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 with: name: macos_tgz_package