Skip to content

Commit d5ffbbd

Browse files
committed
ci: use free GH arm runners
1 parent 5f90117 commit d5ffbbd

File tree

2 files changed

+4
-19
lines changed

2 files changed

+4
-19
lines changed

.github/workflows/build.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -297,9 +297,9 @@ jobs:
297297
needs: checkout-linux
298298
with:
299299
build-runs-on: electron-arc-linux-amd64-32core
300-
test-runs-on: electron-arc-linux-arm64-4core
300+
test-runs-on: ubuntu-24.04-arm
301301
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"]}'
302-
test-container: '{"image":"ghcr.io/electron/test:arm32v7-${{ needs.checkout-linux.outputs.build-image-sha }}","options":"--user root --privileged --init","volumes":["/home/runner/externals:/mnt/runner-externals"]}'
302+
test-container: '{"image":"ghcr.io/electron/test:arm32v7-${{ needs.checkout-linux.outputs.build-image-sha }}","options":"--user root --privileged --init","volumes":["/home/runner/actions-runner/cached/externals:/mnt/runner-externals"]}'
303303
target-platform: linux
304304
target-arch: arm
305305
is-release: false
@@ -317,7 +317,7 @@ jobs:
317317
needs: checkout-linux
318318
with:
319319
build-runs-on: electron-arc-linux-amd64-32core
320-
test-runs-on: electron-arc-linux-arm64-4core
320+
test-runs-on: ubuntu-24.04-arm
321321
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"]}'
322322
test-container: '{"image":"ghcr.io/electron/test:arm64v8-${{ needs.checkout-linux.outputs.build-image-sha }}","options":"--user root --privileged --init"}'
323323
target-platform: linux
@@ -376,7 +376,7 @@ jobs:
376376
if: ${{ needs.setup.outputs.src == 'true' && !inputs.skip-windows }}
377377
with:
378378
build-runs-on: electron-arc-windows-amd64-16core
379-
test-runs-on: electron-hosted-windows-arm64-4core
379+
test-runs-on: windows-11-arm
380380
target-platform: win
381381
target-arch: arm64
382382
is-release: false

.github/workflows/pipeline-segment-electron-test.yml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -62,21 +62,6 @@ jobs:
6262
if: ${{ inputs.target-arch == 'arm' && inputs.target-platform == 'linux' }}
6363
run: |
6464
cp $(which node) /mnt/runner-externals/node20/bin/
65-
- name: Install Git on Windows arm64 runners
66-
if: ${{ inputs.target-arch == 'arm64' && inputs.target-platform == 'win' }}
67-
shell: powershell
68-
run: |
69-
Set-ExecutionPolicy Bypass -Scope Process -Force
70-
[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072
71-
iex ((New-Object System.Net.WebClient).DownloadString('https://community.chocolatey.org/install.ps1'))
72-
choco install -y --no-progress git.install --params "'/GitAndUnixToolsOnPath'"
73-
choco install -y --no-progress git
74-
choco install -y --no-progress python --version 3.11.9
75-
choco install -y --no-progress visualstudio2022-workload-vctools --package-parameters "--add Microsoft.VisualStudio.Component.VC.Tools.ARM64"
76-
echo "C:\Program Files\Git\cmd" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
77-
echo "C:\Program Files\Git\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
78-
echo "C:\Python311" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
79-
cp "C:\Python311\python.exe" "C:\Python311\python3.exe"
8065
- name: Setup Node.js/npm
8166
if: ${{ inputs.target-platform == 'win' }}
8267
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020

0 commit comments

Comments
 (0)