From 4df1063e30612e35c8ff29d1f37f2c876a16144f Mon Sep 17 00:00:00 2001 From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com> Date: Thu, 27 Mar 2025 09:09:06 -0500 Subject: [PATCH] build: roll build-images SHAs (#46320) Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr --- .devcontainer/docker-compose.yml | 2 +- .github/workflows/build.yml | 4 ++-- .github/workflows/linux-publish.yml | 2 +- .github/workflows/macos-publish.yml | 2 +- .github/workflows/windows-publish.yml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index f867f0eb621a..b422e8a938ed 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -2,7 +2,7 @@ version: '3' services: buildtools: - image: ghcr.io/electron/devcontainer:77262e58c37631ab082482f42c33cdf68c6c394b + image: ghcr.io/electron/devcontainer:9f11982e806f439d0a0a8ebbbf566cd5e0d9e952 volumes: - ..:/workspaces/gclient/src/electron:cached diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ddb09c5593d6..f9d393575956 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -6,7 +6,7 @@ on: build-image-sha: type: string description: 'SHA for electron/build image' - default: 'bc2f48b2415a670de18d13605b1cf0eb5fdbaae1' + default: '9f11982e806f439d0a0a8ebbbf566cd5e0d9e952' required: true skip-macos: type: boolean @@ -64,7 +64,7 @@ jobs: id: set-output run: | if [ -z "${{ inputs.build-image-sha }}" ]; then - echo "build-image-sha=bc2f48b2415a670de18d13605b1cf0eb5fdbaae1" >> "$GITHUB_OUTPUT" + echo "build-image-sha=9f11982e806f439d0a0a8ebbbf566cd5e0d9e952" >> "$GITHUB_OUTPUT" else echo "build-image-sha=${{ inputs.build-image-sha }}" >> "$GITHUB_OUTPUT" fi diff --git a/.github/workflows/linux-publish.yml b/.github/workflows/linux-publish.yml index cfba90632237..9443d54f324e 100644 --- a/.github/workflows/linux-publish.yml +++ b/.github/workflows/linux-publish.yml @@ -6,7 +6,7 @@ on: build-image-sha: type: string description: 'SHA for electron/build image' - default: 'bc2f48b2415a670de18d13605b1cf0eb5fdbaae1' + default: '9f11982e806f439d0a0a8ebbbf566cd5e0d9e952' upload-to-storage: description: 'Uploads to Azure storage' required: false diff --git a/.github/workflows/macos-publish.yml b/.github/workflows/macos-publish.yml index 95673bde170c..d20b2d8d94a0 100644 --- a/.github/workflows/macos-publish.yml +++ b/.github/workflows/macos-publish.yml @@ -6,7 +6,7 @@ on: build-image-sha: type: string description: 'SHA for electron/build image' - default: 'bc2f48b2415a670de18d13605b1cf0eb5fdbaae1' + default: '9f11982e806f439d0a0a8ebbbf566cd5e0d9e952' required: true upload-to-storage: description: 'Uploads to Azure storage' diff --git a/.github/workflows/windows-publish.yml b/.github/workflows/windows-publish.yml index 0f4ee5915298..3b0f0ad3e5e9 100644 --- a/.github/workflows/windows-publish.yml +++ b/.github/workflows/windows-publish.yml @@ -6,7 +6,7 @@ on: build-image-sha: type: string description: 'SHA for electron/build image' - default: 'bc2f48b2415a670de18d13605b1cf0eb5fdbaae1' + default: '9f11982e806f439d0a0a8ebbbf566cd5e0d9e952' required: true upload-to-storage: description: 'Uploads to Azure storage'