diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 02405f84ab..9a47ec3dbc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -136,6 +136,7 @@ jobs: needs: checkout-macos with: build-runs-on: macos-14-xlarge + check-runs-on: macos-14 test-runs-on: macos-13 target-platform: macos target-arch: x64 @@ -154,6 +155,7 @@ jobs: needs: checkout-macos with: build-runs-on: macos-14-xlarge + check-runs-on: macos-14 test-runs-on: macos-14 target-platform: macos target-arch: arm64 @@ -172,6 +174,7 @@ jobs: needs: checkout-linux with: build-runs-on: electron-arc-linux-amd64-32core + check-runs-on: electron-arc-linux-amd64-8core test-runs-on: electron-arc-linux-amd64-4core 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/build:${{ needs.checkout-linux.outputs.build-image-sha }}","options":"--user root --privileged --init"}' @@ -192,6 +195,7 @@ jobs: needs: checkout-linux with: build-runs-on: electron-arc-linux-amd64-32core + check-runs-on: electron-arc-linux-amd64-8core test-runs-on: electron-arc-linux-amd64-4core 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/build:${{ needs.checkout-linux.outputs.build-image-sha }}","options":"--user root --privileged --init"}' @@ -213,6 +217,7 @@ jobs: needs: checkout-linux with: build-runs-on: electron-arc-linux-amd64-32core + check-runs-on: electron-arc-linux-amd64-8core test-runs-on: electron-arc-linux-arm64-4core 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:arm32v7-${{ needs.checkout-linux.outputs.build-image-sha }}","options":"--user root --privileged --init","volumes":["/home/runner/externals:/mnt/runner-externals"]}' @@ -233,6 +238,7 @@ jobs: needs: checkout-linux with: build-runs-on: electron-arc-linux-amd64-32core + check-runs-on: electron-arc-linux-amd64-8core test-runs-on: electron-arc-linux-arm64-4core 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"}' diff --git a/.github/workflows/pipeline-electron-build-and-test-and-nan.yml b/.github/workflows/pipeline-electron-build-and-test-and-nan.yml index f6ed1fc706..1aa377cd46 100644 --- a/.github/workflows/pipeline-electron-build-and-test-and-nan.yml +++ b/.github/workflows/pipeline-electron-build-and-test-and-nan.yml @@ -15,6 +15,10 @@ on: type: string description: 'What host to run the build' required: true + check-runs-on: + type: string + description: 'What host to run the gn-check' + required: true test-runs-on: type: string description: 'What host to run the tests on' @@ -77,7 +81,7 @@ jobs: with: target-platform: ${{ inputs.target-platform }} target-arch: ${{ inputs.target-arch }} - check-runs-on: ${{ inputs.build-runs-on }} + check-runs-on: ${{ inputs.check-runs-on }} check-container: ${{ inputs.build-container }} gn-build-type: ${{ inputs.gn-build-type }} is-asan: ${{ inputs.is-asan }} diff --git a/.github/workflows/pipeline-electron-build-and-test.yml b/.github/workflows/pipeline-electron-build-and-test.yml index 5501910ddd..9504d7d03c 100644 --- a/.github/workflows/pipeline-electron-build-and-test.yml +++ b/.github/workflows/pipeline-electron-build-and-test.yml @@ -15,6 +15,10 @@ on: type: string description: 'What host to run the build' required: true + check-runs-on: + type: string + description: 'What host to run the gn-check' + required: true test-runs-on: type: string description: 'What host to run the tests on' @@ -83,7 +87,7 @@ jobs: with: target-platform: ${{ inputs.target-platform }} target-arch: ${{ inputs.target-arch }} - check-runs-on: ${{ inputs.build-runs-on }} + check-runs-on: ${{ inputs.check-runs-on }} check-container: ${{ inputs.build-container }} gn-build-type: ${{ inputs.gn-build-type }} is-asan: ${{ inputs.is-asan }}