From 90b4003ad59f0ecacf58961df6bafc34f42148f6 Mon Sep 17 00:00:00 2001 From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com> Date: Wed, 21 Jan 2026 15:18:11 +0100 Subject: [PATCH] build: roll build-image to `a82b87d` (#49451) * build: roll build-image to a82b87d Co-authored-by: Shelley Vohr * build: roll build-tools SHA to 4430e4a (cherry picked from commit b989c070c67e63482775d742fbedcc5b6b7cc290) --------- Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr --- .devcontainer/docker-compose.yml | 2 +- .github/actions/install-build-tools/action.yml | 2 +- .github/workflows/build-git-cache.yml | 6 +++--- .github/workflows/build.yml | 4 ++-- .github/workflows/linux-publish.yml | 2 +- .github/workflows/macos-publish.yml | 2 +- .github/workflows/windows-publish.yml | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index ddf29ed5de..21aeb257fe 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -2,7 +2,7 @@ version: '3' services: buildtools: - image: ghcr.io/electron/devcontainer:933c7d6ff6802706875270bec2e3c891cf8add3f + image: ghcr.io/electron/devcontainer:a82b87d7a4f5ff0cab61405f8151ac4cf4942aeb volumes: - ..:/workspaces/gclient/src/electron:cached diff --git a/.github/actions/install-build-tools/action.yml b/.github/actions/install-build-tools/action.yml index 868cdc63a4..4b9ae7d820 100644 --- a/.github/actions/install-build-tools/action.yml +++ b/.github/actions/install-build-tools/action.yml @@ -15,7 +15,7 @@ runs: git config --global core.preloadindex true git config --global core.longpaths true fi - export BUILD_TOOLS_SHA=706147b2376f55078f718576b28129a0457f1795 + export BUILD_TOOLS_SHA=4430e4a505e0f4fa2a41b707a10a36f780bbdd26 npm i -g @electron/build-tools # Update depot_tools to ensure python e d update_depot_tools diff --git a/.github/workflows/build-git-cache.yml b/.github/workflows/build-git-cache.yml index d21c0f0d67..66e8048d81 100644 --- a/.github/workflows/build-git-cache.yml +++ b/.github/workflows/build-git-cache.yml @@ -14,7 +14,7 @@ jobs: permissions: contents: read container: - image: ghcr.io/electron/build:bc2f48b2415a670de18d13605b1cf0eb5fdbaae1 + image: ghcr.io/electron/build:a82b87d7a4f5ff0cab61405f8151ac4cf4942aeb options: --user root volumes: - /mnt/cross-instance-cache:/mnt/cross-instance-cache @@ -37,7 +37,7 @@ jobs: permissions: contents: read container: - image: ghcr.io/electron/build:bc2f48b2415a670de18d13605b1cf0eb5fdbaae1 + image: ghcr.io/electron/build:a82b87d7a4f5ff0cab61405f8151ac4cf4942aeb options: --user root --device /dev/fuse --cap-add SYS_ADMIN volumes: - /mnt/win-cache:/mnt/win-cache @@ -63,7 +63,7 @@ jobs: # This job updates the same git cache as linux, so it needs to run after the linux one. needs: build-git-cache-linux container: - image: ghcr.io/electron/build:bc2f48b2415a670de18d13605b1cf0eb5fdbaae1 + image: ghcr.io/electron/build:a82b87d7a4f5ff0cab61405f8151ac4cf4942aeb options: --user root volumes: - /mnt/cross-instance-cache:/mnt/cross-instance-cache diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3b87e771d7..dc08065ec7 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: '933c7d6ff6802706875270bec2e3c891cf8add3f' + default: 'a82b87d7a4f5ff0cab61405f8151ac4cf4942aeb' required: true skip-macos: type: boolean @@ -76,7 +76,7 @@ jobs: id: set-output run: | if [ -z "${{ inputs.build-image-sha }}" ]; then - echo "build-image-sha=933c7d6ff6802706875270bec2e3c891cf8add3f" >> "$GITHUB_OUTPUT" + echo "build-image-sha=a82b87d7a4f5ff0cab61405f8151ac4cf4942aeb" >> "$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 5a01019951..98c08f31c9 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: '933c7d6ff6802706875270bec2e3c891cf8add3f' + default: 'a82b87d7a4f5ff0cab61405f8151ac4cf4942aeb' 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 0c5f45a9dc..b2f706af3b 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: '933c7d6ff6802706875270bec2e3c891cf8add3f' + default: 'a82b87d7a4f5ff0cab61405f8151ac4cf4942aeb' 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 53fd4161bf..0f6e9919bc 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: '933c7d6ff6802706875270bec2e3c891cf8add3f' + default: 'a82b87d7a4f5ff0cab61405f8151ac4cf4942aeb' required: true upload-to-storage: description: 'Uploads to Azure storage'