Merge branch 'main' into ub_check

iovisor · May 21, 2024 · f295857 · f295857
2 parents 3efeeac + 6789eee
commit f295857
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 17 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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,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
@@ -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

diff --git 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