Skip to content

Commit

Permalink
ci(macos): upload tarballs for both macos x64 and arm64
Browse files Browse the repository at this point in the history
  • Loading branch information
Rinse12 committed Nov 27, 2024
1 parent ace7441 commit 59116a8
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 deletions.
14 changes: 8 additions & 6 deletions .github/workflows/CI-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,13 @@ jobs:
tag: ${{ steps.previoustag.outputs.tag }}
overwrite: true

generate-upload-tarballs-macos-x64:
name: Generate and upload tarballs for Macos x64
generate-upload-tarballs-macos-x64-arm64:
name: Generate and upload tarballs for Macos (x64 + arm64)
if: ${{ github.event.workflow_run.conclusion == 'success' }}
runs-on: macos-latest # should use x64 arch
runs-on: macos-latest # will use arm64
strategy:
matrix:
arch: [x64, arm64]
steps:
- name: Checkout
uses: actions/checkout@v4
Expand All @@ -69,7 +72,7 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Generate tarballs
run: yarn generate:executable:tarballs:macos:x64
run: yarn generate:executable:tarballs:macos:${{ matrix.arch }}
- name: Rename tarballs and installers
run: yarn ci:rename-tarballs
- name: Upload tarballs to release
Expand All @@ -79,7 +82,6 @@ jobs:
file_glob: true
tag: ${{ steps.previoustag.outputs.tag }}
overwrite: true


generate-upload-windows-installers:
name: Generate and upload windows installers
Expand Down Expand Up @@ -109,7 +111,7 @@ jobs:
run: yarn generate:installer:windows
shell: bash
# You can't use oclif pack on windows, so we're skipping it for now
# - name: Generate Windows tarballs
# - name: Generate Windows tarballs
# run: yarn generate:executable:tarballs:windows
- name: Rename tarballs and installers
run: yarn ci:rename-tarballs
Expand Down
2 changes: 1 addition & 1 deletion bin/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set -e

case $(uname -sm) in
"Darwin x86_64") suffix="darwin-x64" ;;
"Darwin arm64") suffix="darwin-x64" ;;
"Darwin arm64") suffix="darwin-arm64" ;;
"Linux aarch64") suffix="linux-arm64" ;;
"Linux x86_64") suffix="linux-x64" ;;
*) suffix="no-file-name" ;;
Expand Down

0 comments on commit 59116a8

Please sign in to comment.