diff --git a/.github/workflows/build-helper.yml b/.github/workflows/build-helper.yml index eadb18ce77..e2eff175e7 100644 --- a/.github/workflows/build-helper.yml +++ b/.github/workflows/build-helper.yml @@ -28,8 +28,8 @@ jobs: runner: ubuntu-24.04-arm - platform: "windows" runner: "windows-latest" - # - platform: "windows" - # runner: "windows-11-arm64-16core" + - platform: "windows" + runner: "windows-11-arm" runs-on: ${{ matrix.runner }} steps: - uses: actions/checkout@v6 @@ -80,7 +80,7 @@ jobs: command: npm ci --no-audit --no-fund retry_on: error max_attempts: 3 - timeout_minutes: 5 + timeout_minutes: 15 env: GIT_ASKPASS: "echo" GIT_TERMINAL_PROMPT: "0" @@ -156,6 +156,7 @@ jobs: CSC_LINK: ${{ steps.variables.outputs.SM_CLIENT_CERT_FILE }} CSC_KEY_PASSWORD: ${{ secrets.SM_CLIENT_CERT_PASSWORD }} STATIC_DOCSITE_PATH: ${{env.STATIC_DOCSITE_PATH}} + CC: ${{ contains(matrix.runner, 'arm') && 'zig cc -target aarch64-windows-gnu' || '' }} shell: powershell # electron-builder's Windows code signing package has some compatibility issues with pwsh, so we need to use Windows Powershell # Upload artifacts to the S3 staging and to the workflow output for the draft release job diff --git a/Taskfile.yml b/Taskfile.yml index 106ac99e0b..ff3c6afc5d 100644 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -431,7 +431,7 @@ tasks: vars: UP_VERSION: '{{ replace "v" "" (index .MATCH 0)}}' cmd: | - wingetcreate update {{.WINGET_PACKAGE}} -s -v {{.UP_VERSION}} -u "https://{{.RELEASES_BUCKET}}/{{.APP_NAME}}-win32-x64-{{.UP_VERSION}}.msi" -t {{.GITHUB_TOKEN}} + wingetcreate update {{.WINGET_PACKAGE}} -s -v {{.UP_VERSION}} -u "https://{{.RELEASES_BUCKET}}/{{.APP_NAME}}-win32-x64-{{.UP_VERSION}}.msi" "https://{{.RELEASES_BUCKET}}/{{.APP_NAME}}-win32-arm64-{{.UP_VERSION}}.msi" -t {{.GITHUB_TOKEN}} dev:installwsh: desc: quick shortcut to rebuild wsh and install for macos arm64