Skip to content

Commit

Permalink
Update to macos-latest
Browse files Browse the repository at this point in the history
Signed-off-by: Alan Jowett <[email protected]>
  • Loading branch information
Alan Jowett committed May 20, 2024
1 parent a299839 commit 90b0dbc
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/fuzzing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
24 changes: 12 additions & 12 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,15 +66,15 @@ jobs:
uses: ./.github/workflows/posix.yml
with:
arch: x86_64
platform: macos-11
platform: macos-latest
build_type: RelWithDebInfo
upload_packages: true

macos_release_no_retpolines:
uses: ./.github/workflows/posix.yml
with:
arch: x86_64
platform: macos-11
platform: macos-latest
build_type: RelWithDebInfo
upload_packages: true
disable_retpolines: true
Expand All @@ -83,15 +83,15 @@ jobs:
uses: ./.github/workflows/posix.yml
with:
arch: x86_64
platform: macos-11
platform: macos-latest
build_type: RelWithDebInfo
enable_coverage: true

macos_release_coverage_no_retpolines:
uses: ./.github/workflows/posix.yml
with:
arch: x86_64
platform: macos-11
platform: macos-latest
build_type: RelWithDebInfo
enable_coverage: true
disable_retpolines: true
Expand All @@ -100,15 +100,15 @@ jobs:
uses: ./.github/workflows/posix.yml
with:
arch: x86_64
platform: macos-11
platform: macos-latest
build_type: RelWithDebInfo
enable_sanitizers: true

macos_release_sanitizers_no_retpolines:
uses: ./.github/workflows/posix.yml
with:
arch: x86_64
platform: macos-11
platform: macos-latest
build_type: RelWithDebInfo
enable_sanitizers: true
disable_retpolines: true
Expand All @@ -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

Expand All @@ -134,15 +134,15 @@ jobs:
uses: ./.github/workflows/posix.yml
with:
arch: x86_64
platform: macos-11
platform: macos-latest
build_type: Debug
enable_coverage: true

macos_debug_coverage_no_retpolines:
uses: ./.github/workflows/posix.yml
with:
arch: x86_64
platform: macos-11
platform: macos-latest
build_type: Debug
enable_coverage: true
disable_retpolines: true
Expand All @@ -151,15 +151,15 @@ jobs:
uses: ./.github/workflows/posix.yml
with:
arch: x86_64
platform: macos-11
platform: macos-latest
build_type: Debug
enable_sanitizers: true

macos_debug_sanitizers_no_retpolines:
uses: ./.github/workflows/posix.yml
with:
arch: x86_64
platform: macos-11
platform: macos-latest
build_type: Debug
enable_sanitizers: true
disable_retpolines: true
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/posix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 90b0dbc

Please sign in to comment.