Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

revert to intel runner for mac os (Reapply #4893) #4911

Merged
merged 3 commits into from
Sep 23, 2024
Merged

revert to intel runner for mac os (Reapply #4893) #4911

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b0fbe8c
revert to intel runner for mac os
cwisniew Sep 4, 2024
897201d
Merge branch 'develop' into reapply-4893
cwisniew Sep 14, 2024
a07ee3d
Merge branch 'develop' into reapply-4893
cwisniew Sep 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/verify-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading