diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6aa2e2d57620..358e4460683a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -329,7 +329,7 @@ jobs: if: ${{ needs.setup.outputs.src == 'true' }} with: build-runs-on: electron-arc-centralus-linux-amd64-32core - test-runs-on: electron-arc-centralus-linux-arm64-4core + test-runs-on: ubuntu-22.04-arm build-container: '{"image":"ghcr.io/electron/build:${{ needs.checkout-linux.outputs.build-image-sha }}","options":"--user root","volumes":["/mnt/cross-instance-cache:/mnt/cross-instance-cache"]}' test-container: '{"image":"ghcr.io/electron/test:arm64v8-${{ needs.checkout-linux.outputs.build-image-sha }}","options":"--user root --privileged --init"}' target-platform: linux @@ -388,7 +388,7 @@ jobs: if: ${{ needs.setup.outputs.src == 'true' && !inputs.skip-windows }} with: build-runs-on: electron-arc-centralus-windows-amd64-16core - test-runs-on: electron-hosted-windows-arm64-4core + test-runs-on: windows-11-arm target-platform: win target-arch: arm64 is-release: false diff --git a/.github/workflows/pipeline-segment-electron-test.yml b/.github/workflows/pipeline-segment-electron-test.yml index b9100dd5d525..4e440888a7eb 100644 --- a/.github/workflows/pipeline-segment-electron-test.yml +++ b/.github/workflows/pipeline-segment-electron-test.yml @@ -68,21 +68,6 @@ jobs: if: ${{ inputs.target-arch == 'arm' && inputs.target-platform == 'linux' }} run: | cp $(which node) /mnt/runner-externals/node20/bin/ - - name: Install Git on Windows arm64 runners - if: ${{ inputs.target-arch == 'arm64' && inputs.target-platform == 'win' }} - shell: powershell - run: | - Set-ExecutionPolicy Bypass -Scope Process -Force - [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072 - iex ((New-Object System.Net.WebClient).DownloadString('https://community.chocolatey.org/install.ps1')) - choco install -y --no-progress git.install --params "'/GitAndUnixToolsOnPath'" - choco install -y --no-progress git - choco install -y --no-progress python --version 3.11.9 - choco install -y --no-progress visualstudio2022-workload-vctools --package-parameters "--add Microsoft.VisualStudio.Component.VC.Tools.ARM64" - echo "C:\Program Files\Git\cmd" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append - echo "C:\Program Files\Git\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append - echo "C:\Python311" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append - cp "C:\Python311\python.exe" "C:\Python311\python3.exe" - name: Setup Node.js/npm if: ${{ inputs.target-platform == 'win' }} uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020