diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 081ab3b..d399aba 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,8 +16,9 @@ jobs: - os: macos-latest name: macos-default - os: macos-13 - name: macos-x86 + name: macos-intel - os: ubuntu-latest + name: ubuntu-x64 arch: x64 runs-on: ${{ matrix.os }} @@ -41,7 +42,7 @@ jobs: run: bun run init - name: macOS - Build - if: matrix.name == 'macos-default' || matrix.name == 'macos-x86' + if: matrix.name == 'macos-default' || matrix.name == 'macos-intel' run: | source venv-pywebview/bin/activate bun run build @@ -75,7 +76,7 @@ jobs: timestamp-digest: SHA256 - name: macOS - Sign artifact - if: matrix.name == 'macos-default' || matrix.name == 'macos-x86' + if: matrix.name == 'macos-default' || matrix.name == 'macos-intel' run: | echo ${{ secrets.MACOS_CERTIFICATE }} | base64 --decode > certificate.p12 @@ -89,7 +90,7 @@ jobs: /usr/bin/codesign -v ./build/SDT2.app - name: macOS - Notarize artifact - if: matrix.name == 'macos-default' || matrix.name == 'macos-x86' + if: matrix.name == 'macos-default' || matrix.name == 'macos-intel' run: | ditto -c -k --keepParent "build/SDT2.app" "build/SDT2.app.zip" xcrun notarytool store-credentials "notarytool-profile" --apple-id "${{ secrets.MACOS_NOTARIZATION_APPLE_ID }}" --team-id "${{ secrets.MACOS_NOTARIZATION_TEAM_ID }}" --password "${{ secrets.MACOS_NOTARIZATION_PWD }}" > /dev/null @@ -111,5 +112,5 @@ jobs: path: | ${{ matrix.name == 'windows-onefile' && 'build/SDT2.exe' || '' }} ${{ matrix.name == 'windows-standalone' && 'SDT2.zip' || '' }} - ${{ (matrix.name == 'macos-default' || matrix.name == 'macos-x86') && 'build/SDT2.app.zip' || '' }} + ${{ (matrix.name == 'macos-default' || matrix.name == 'macos-intel') && 'build/SDT2.app.zip' || '' }} ${{ (matrix.os == 'ubuntu-latest' || (matrix.os == 'ubuntu-22.04' && matrix.arch == 'arm64')) && 'build/SDT2.tar.gz' || '' }}