Merge pull request #4911 from cwisniew/reapply-4893

revert to intel runner for mac os (Reapply #4893)
RPTools · Sep 23, 2024 · c7ff5c5 · c7ff5c5
2 parents 072cf14 + a07ee3d
commit c7ff5c5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [windows-latest, ubuntu-latest, macOS-latest]
+        os: [windows-latest, ubuntu-latest, macOS-13]
         java: [ '21' ]
         distribution: ['temurin']
       fail-fast: false
@@ -160,15 +160,15 @@ jobs:
       #   /_/ /_/ /_/ \__,_/ \___/ \____//____/
       #
     - name: Copy Mac OS Release Files
-      if: matrix.os == 'macOS-latest'
+      if: matrix.os == 'macOS-13'
       run: |
         cp releases/MapTool*.dmg releases/MapTool-${{ github.event.release.tag_name }}.dmg
         cp releases/MapTool*.pkg releases/MapTool-${{ github.event.release.tag_name }}.pkg
       continue-on-error: true
     - name: Upload Mac DMG Release Asset
       id: upload-release-asset-dmg
       uses: actions/upload-release-asset@v1
-      if: matrix.os == 'macOS-latest'
+      if: matrix.os == 'macOS-13'
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
@@ -179,7 +179,7 @@ jobs:
     - name: Upload Mac PKG Release Asset
       id: upload-release-asset-pkg
       uses: actions/upload-release-asset@v1
-      if: matrix.os == 'macOS-latest'
+      if: matrix.os == 'macOS-13'
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:

diff --git a/.github/workflows/verify-build.yml b/.github/workflows/verify-build.yml
@@ -37,7 +37,7 @@ jobs:
     runs-on:  ${{ matrix.os }}
     strategy:
       matrix:
-        os: [windows-latest, ubuntu-latest, macOS-latest]
+        os: [windows-latest, ubuntu-latest, macOS-13]
         java: [ '21' ]
         distribution: [ 'temurin']
       fail-fast: false