From 57fdff82ffb857d2e1666082f09d85c1fa4f4018 Mon Sep 17 00:00:00 2001 From: Flavio F Lima Date: Wed, 22 Jan 2025 17:17:15 +0000 Subject: [PATCH 1/3] [CI] Update macOS builds --- .github/workflows/build-mac-arm64.yml | 10 +++++----- .github/workflows/build.yml | 12 ++++++------ .github/workflows/release_macOS.yml | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build-mac-arm64.yml b/.github/workflows/build-mac-arm64.yml index 6584250a1..1e3477cea 100644 --- a/.github/workflows/build-mac-arm64.yml +++ b/.github/workflows/build-mac-arm64.yml @@ -1,4 +1,4 @@ -name: Build mac arm64 +name: Build mac x86 on: workflow_dispatch: @@ -9,8 +9,8 @@ env: RUDDERSTACK_CLIENT_ID: ${{ secrets.RUDDERSTACK_CLIENT_ID }} jobs: - release-mac-arm64: - runs-on: macos-latest-xlarge + release-mac-x86: + runs-on: macos-13 steps: - name: Checkout code @@ -19,7 +19,7 @@ jobs: - name: Set up Node.js uses: actions/setup-node@v4 with: - node-version: '20' + node-version: '22' - uses: pnpm/action-setup@v3 with: standalone: ${{ runner.os == 'Windows' }} @@ -43,6 +43,6 @@ jobs: echo "VITE_IPFS_API=${{ secrets.VITE_IPFS_API }}" >> .env - name: Build artifacts. - run: pnpm release:mac:arm64 + run: pnpm release:mac:x64 env: NOTARIZE: true diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 878f6eb87..d9ebe217d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -95,10 +95,10 @@ jobs: run: pnpm dist:linux:ci:rpm - name: Build pacman artifact run: pnpm dist:linux:ci:pacman - build_mac_x64: - runs-on: macos-13 + build_mac_arm64: + runs-on: macos-latest concurrency: - group: build-mac-x64-${{ github.ref }} + group: build-mac-arm64-${{ github.ref }} cancel-in-progress: true steps: - name: Checkout repository. @@ -127,14 +127,14 @@ jobs: echo "VITE_LD_ENVIRONMENT_ID=${{ secrets.VITE_LD_ENVIRONMENT_ID_TEST }}" > .env echo "VITE_IPFS_API=${{ secrets.VITE_IPFS_API }}" >> .env - name: Build artifacts. - run: pnpm run dist:mac:x64 + run: pnpm run dist:mac:arm64 env: NOTARIZE: false - name: Upload Intel build. uses: actions/upload-artifact@v4 with: - name: mac-dmg-x64 - path: dist/HyperPlay*x64.dmg + name: mac-dmg-arm64 + path: dist/HyperPlay*arm64.dmg retention-days: 7 if-no-files-found: error compression-level: 3 diff --git a/.github/workflows/release_macOS.yml b/.github/workflows/release_macOS.yml index 6b7caa887..0340ce2c5 100644 --- a/.github/workflows/release_macOS.yml +++ b/.github/workflows/release_macOS.yml @@ -67,7 +67,7 @@ jobs: if-no-files-found: error release-arm64: - runs-on: macos-latest-xlarge + runs-on: macos-latest steps: - name: Checkout code From 20652991173c909eae76232da6450a1aa3ee9756 Mon Sep 17 00:00:00 2001 From: Flavio F Lima Date: Wed, 22 Jan 2025 17:22:06 +0000 Subject: [PATCH 2/3] chore: filename --- .github/workflows/{build-mac-arm64.yml => build-mac-x64.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{build-mac-arm64.yml => build-mac-x64.yml} (100%) diff --git a/.github/workflows/build-mac-arm64.yml b/.github/workflows/build-mac-x64.yml similarity index 100% rename from .github/workflows/build-mac-arm64.yml rename to .github/workflows/build-mac-x64.yml From 717e3dfe89e605fbebf5c97899d6f2d16166891c Mon Sep 17 00:00:00 2001 From: Flavio F Lima Date: Wed, 22 Jan 2025 17:22:59 +0000 Subject: [PATCH 3/3] chore: workflow name --- .github/workflows/build-mac-x64.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-mac-x64.yml b/.github/workflows/build-mac-x64.yml index 1e3477cea..41eb75e9c 100644 --- a/.github/workflows/build-mac-x64.yml +++ b/.github/workflows/build-mac-x64.yml @@ -1,4 +1,4 @@ -name: Build mac x86 +name: Build mac x64 on: workflow_dispatch: @@ -9,7 +9,7 @@ env: RUDDERSTACK_CLIENT_ID: ${{ secrets.RUDDERSTACK_CLIENT_ID }} jobs: - release-mac-x86: + release-mac-x64: runs-on: macos-13 steps: