From 9f625af6755e79957180c3b1972a724cf4c90436 Mon Sep 17 00:00:00 2001 From: Makito Date: Sat, 7 Feb 2026 22:09:08 +0900 Subject: [PATCH] fix(ci): use macos-26 instead of macos-latest for ARM macOS --- .github/workflows/release-tamagotchi.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/release-tamagotchi.yml b/.github/workflows/release-tamagotchi.yml index f52abe1c6..ded5a0235 100644 --- a/.github/workflows/release-tamagotchi.yml +++ b/.github/workflows/release-tamagotchi.yml @@ -57,7 +57,7 @@ jobs: builder-args: --macos --x64 skip: ${{ inputs.platform != '' && inputs.platform != 'all' && inputs.platform != 'macos' }} - - os: macos-latest + - os: macos-26 artifact: darwin-arm64 target: aarch64-apple-darwin builder-args: --macos --arm64 @@ -106,7 +106,7 @@ jobs: # https://docs.github.com/en/actions/how-tos/deploy/deploy-to-third-party-platforms/sign-xcode-applications # - name: Install the Apple certificate (macOS Only) - # if: matrix.os == 'macos-15-intel' || matrix.os == 'macos-latest' + # if: matrix.os == 'macos-15-intel' || matrix.os == 'macos-26' # env: # BUILD_CERTIFICATE_BASE64: ${{ secrets.BUILD_CERTIFICATE_BASE64 }} # P12_PASSWORD: ${{ secrets.P12_PASSWORD }} @@ -130,13 +130,13 @@ jobs: # security list-keychain -d user -s $KEYCHAIN_PATH - name: macOS Show Xcode 26.1 - if: matrix.os == 'macos-15-intel' || matrix.os == 'macos-latest' + if: matrix.os == 'macos-15-intel' || matrix.os == 'macos-26' run: | sudo xcode-select -s /Applications/Xcode_26.1.app xcodebuild -version - name: macOS Show Toolchain - if: matrix.os == 'macos-15-intel' || matrix.os == 'macos-latest' + if: matrix.os == 'macos-15-intel' || matrix.os == 'macos-26' run: | xcodebuild -version actool --version @@ -163,7 +163,7 @@ jobs: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Build (macOS Only) # macOS - if: matrix.os == 'macos-15-intel' || matrix.os == 'macos-latest' + if: matrix.os == 'macos-15-intel' || matrix.os == 'macos-26' run: pnpm run -F @proj-airi/stage-tamagotchi build && pnpm -F @proj-airi/stage-tamagotchi exec electron-builder build ${{ matrix.builder-args }} --publish=onTagOrDraft env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -211,7 +211,7 @@ jobs: echo "VERSION=$(pnpm exec tsx scripts/artifacts-metadata.ts ${{ matrix.target }} --get-version)" >> $GITHUB_ENV - name: Get Artifacts Envs (Nightly + macOS Only) - if: ${{ github.event_name == 'schedule' && (matrix.os == 'macos-latest' || matrix.os == 'macos-15-intel') }} + if: ${{ github.event_name == 'schedule' && (matrix.os == 'macos-26' || matrix.os == 'macos-15-intel') }} working-directory: ./apps/stage-tamagotchi run: | echo "BUNDLE_NAME=$(pnpm exec tsx scripts/artifacts-metadata.ts ${{ matrix.target }} --get-bundle-name)" >> $GITHUB_ENV @@ -275,7 +275,7 @@ jobs: echo "VERSION=$(pnpm exec tsx scripts/artifacts-metadata.ts ${{ matrix.target }} --get-version --release ${{ !inputs.build_only && !inputs.artifacts_only }} --tag ${{ inputs.tag }} --auto-tag ${{ !inputs.build_only }})" > $GITHUB_ENV - name: Get Artifacts Envs (Manual + macOS Only) - if: ${{ github.event_name == 'workflow_dispatch' && (matrix.os == 'macos-latest' || matrix.os == 'macos-15-intel') }} + if: ${{ github.event_name == 'workflow_dispatch' && (matrix.os == 'macos-26' || matrix.os == 'macos-15-intel') }} working-directory: ./apps/stage-tamagotchi run: | echo "BUNDLE_NAME=$(pnpm exec tsx scripts/artifacts-metadata.ts ${{ matrix.target }} --get-bundle-name --release ${{ !inputs.build_only && !inputs.artifacts_only }} --tag ${{ inputs.tag }} --auto-tag ${{ !inputs.build_only }})" > $GITHUB_ENV @@ -339,7 +339,7 @@ jobs: pnpm run -F @proj-airi/stage-tamagotchi rename-artifacts ${{ matrix.target }} --release --auto-tag - name: Upload macOS update info (Automatic + macOS Only) - if: ${{ github.event_name == 'release' && (matrix.os == 'macos-latest' || matrix.os == 'macos-15-intel') }} + if: ${{ github.event_name == 'release' && (matrix.os == 'macos-26' || matrix.os == 'macos-15-intel') }} uses: actions/upload-artifact@v4 with: name: latest-mac-yml-${{ matrix.arch }} @@ -366,7 +366,7 @@ jobs: append_body: true # - name: Clean up keychain and provisioning profile (macOS Only) - # if: ${{ always() && (matrix.os == 'macos-15-intel' || matrix.os == 'macos-latest') }} + # if: ${{ always() && (matrix.os == 'macos-15-intel' || matrix.os == 'macos-26') }} # run: | # security delete-keychain $RUNNER_TEMP/app-signing.keychain-db