Skip to content

Commit 0aa407c

Browse files
authored
chore: deploy docker image w/ node 22 (#8781)
This PR updates electron-builder to node 22 (note: this is separate from electron-updater) in order to adopt updates/fixes from @electron/* packages. Read more @ https://www.electronjs.org/blog/ecosystem-node-22 In order to continue supporting the ecosystem, this PR also adds a new docker image set for node 22. `electronuserland/builder:22`. This will now be `latest` tag
1 parent 74355da commit 0aa407c

File tree

8 files changed

+15
-8
lines changed

8 files changed

+15
-8
lines changed

.github/actions/pnpm/action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ runs:
1717
- name: Setup node
1818
uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4
1919
with:
20-
node-version: '18'
20+
node-version: '22'
2121
cache: 'pnpm'
2222

2323
- name: Install dependencies

.github/actions/pretest/action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ runs:
2828
- name: Setup node
2929
uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4
3030
with:
31-
node-version: '18'
31+
node-version: '22'
3232
cache: 'pnpm'
3333

3434
- name: Install dependencies

.github/workflows/deploy-docker.yml

+7-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ permissions:
1212
contents: read
1313

1414
env:
15-
LATEST_IMAGE_NODE_MAJOR_VERSION: 20
15+
LATEST_IMAGE_NODE_MAJOR_VERSION: 22
1616

1717
jobs:
1818
run-docker-build-and-test:
@@ -50,6 +50,12 @@ jobs:
5050
name: electron-builder-all-20
5151
path: ${{ runner.temp }}
5252

53+
- name: Download images artifact - node22
54+
uses: actions/download-artifact@v4
55+
with:
56+
name: electron-builder-all-22
57+
path: ${{ runner.temp }}
58+
5359
- name: Load all images
5460
run: find ${{ runner.temp }} -type f -name "electron-builder-all-*.tar" -exec docker image load --input "{}" \;
5561

.github/workflows/docker-build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
fail-fast: false
1414
matrix:
1515
nodeVersion: [
16-
# 22.13.0,
16+
22.13.0,
1717
20.18.1,
1818
18.20.5,
1919
16.20.2,

.github/workflows/test.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ permissions:
2222
contents: read
2323

2424
env:
25-
TEST_IMAGE_NODE_MAJOR_VERSION: 20
25+
TEST_IMAGE_NODE_MAJOR_VERSION: 22
2626

2727
jobs:
2828
check-if-docker-build:

docker/node/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
ARG IMAGE_VERSION=base
22
FROM --platform=linux/x86_64 electronuserland/builder:$IMAGE_VERSION
33

4-
ARG NODE_VERSION
4+
ARG NODE_VERSION=22.13.0
55

66
# this package is used for snapcraft and we should not clear apt list - to avoid apt-get update during snap build
77
RUN curl -L https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.gz | tar xz -C /usr/local --strip-components=1 && \

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"///": "Please see https://github.com/electron-userland/electron-builder/blob/master/CONTRIBUTING.md#run-test-using-cli how to run particular test instead full (and very slow) run",
2121
"test": "node ./test/out/helpers/runTests.js skipArtifactPublisher",
2222
"test-all": "pnpm compile && pnpm pretest && pnpm ci:test",
23-
"test-linux": "docker run --rm -e DEBUG=${DEBUG:-} -e UPDATE_SNAPSHOT=${UPDATE_SNAPSHOT:-false} -e TEST_FILES=\"${TEST_FILES:-HoistedNodeModuleTest}\" -v $(pwd):/project -v $(pwd)-node-modules:/project/node_modules -v $HOME/Library/Caches/electron:/root/.cache/electron -v $HOME/Library/Caches/electron-builder:/root/.cache/electron-builder ${TEST_RUNNER_IMAGE_TAG:-electronuserland/builder:20-wine-mono} /bin/bash -c \"pnpm install && node ./test/out/helpers/runTests.js\"",
23+
"test-linux": "docker run --rm -e DEBUG=${DEBUG:-} -e UPDATE_SNAPSHOT=${UPDATE_SNAPSHOT:-false} -e TEST_FILES=\"${TEST_FILES:-HoistedNodeModuleTest}\" -v $(pwd):/project -v $(pwd)-node-modules:/project/node_modules -v $HOME/Library/Caches/electron:/root/.cache/electron -v $HOME/Library/Caches/electron-builder:/root/.cache/electron-builder ${TEST_RUNNER_IMAGE_TAG:-electronuserland/builder:22-wine-mono} /bin/bash -c \"pnpm install && node ./test/out/helpers/runTests.js\"",
2424
"test-update": "UPDATE_SNAPSHOT=true pnpm test-all",
2525
"docker-images": "docker/build.sh",
2626
"docker-push": "docker/push.sh",

packages/electron-builder/package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@
4444
],
4545
"author": "Vladimir Krivosheev",
4646
"contributors": [
47-
"Stefan Judis"
47+
"Stefan Judis",
48+
"Mike Maietta"
4849
],
4950
"license": "MIT",
5051
"bugs": "https://github.com/electron-userland/electron-builder/issues",

0 commit comments

Comments
 (0)