Skip to content

Commit

Permalink
Update x64/Arm Mac runners in GH Actions (#155)
Browse files Browse the repository at this point in the history
  • Loading branch information
sergeichestakov authored Apr 30, 2024
1 parent ec4cd78 commit ac84bc4
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ macOS-13-xlarge, macOS-latest, ubuntu-latest, windows-latest ]
os: [ macOS-latest, macOS-12, ubuntu-latest, windows-latest ]
arch: [ x64, arm64 ]
# Publishing artifacts for multiple Windows architectures has
# a bug which can cause the wrong architecture to be downloaded
Expand All @@ -68,9 +68,9 @@ jobs:
arch: arm64
# Only build arm64 builds on M1 and x86 builds on Intel Mac
- os: macOS-latest
arch: arm64
- os: macOS-13-xlarge
arch: x64
- os: macOS-12
arch: arm64

steps:
- uses: actions/checkout@v3
Expand All @@ -96,7 +96,7 @@ jobs:
fileName: 'windows-certificate.pfx'
encodedString: ${{ secrets.WINDOWS_CODESIGN_CERTIFICATE }}
- name: Generate MacOS code signing certificate
if: matrix.os == 'macOS-latest' || matrix.os == 'macOS-13-xlarge'
if: matrix.os == 'macOS-latest' || matrix.os == 'macOS-12'
run: ./scripts/add-macos-cert.sh
env:
MACOS_CERT_P12: ${{ secrets.MACOS_CERT_P12 }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ macOS-13-xlarge, macOS-latest, ubuntu-latest, windows-latest ]
os: [ macOS-latest, macOS-12, ubuntu-latest, windows-latest ]
arch: [ x64, arm64 ]
# Publishing artifacts for multiple Windows architectures has
# a bug which can cause the wrong architecture to be downloaded
Expand All @@ -20,9 +20,9 @@ jobs:
arch: arm64
# Only build arm64 builds on M1 and x86 builds on Intel Mac
- os: macOS-latest
arch: arm64
- os: macOS-13-xlarge
arch: x64
- os: macOS-12
arch: arm64

steps:
- uses: actions/checkout@v3
Expand Down Expand Up @@ -50,7 +50,7 @@ jobs:
fileName: 'windows-certificate.pfx'
encodedString: ${{ secrets.WINDOWS_CODESIGN_CERTIFICATE }}
- name: Generate MacOS code signing certificate
if: matrix.os == 'macOS-latest' || matrix.os == 'macOS-13-xlarge'
if: matrix.os == 'macOS-latest' || matrix.os == 'macOS-12'
run: ./scripts/add-macos-cert.sh
env:
MACOS_CERT_P12: ${{ secrets.MACOS_CERT_P12 }}
Expand Down

0 comments on commit ac84bc4

Please sign in to comment.