Skip to content

Commit b9ee046

Browse files
Merge branch 'master' into eslintSecuritySpike
2 parents 350457e + cd8b2c6 commit b9ee046

20 files changed

Lines changed: 547 additions & 404 deletions

File tree

.github/workflows/publish.yml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,43 +4,43 @@ on:
44
release:
55
types: [published]
66

7+
permissions:
8+
id-token: write # Required for OIDC (Trusted Publishing)
9+
contents: read
10+
711
jobs:
812
npm-publish:
913
if: ${{ !github.event.release.draft }}
1014
runs-on: ubuntu-latest
11-
environment: release
15+
environment: npmjs
1216
steps:
13-
- uses: actions/checkout@v3
17+
- uses: actions/checkout@v4
1418
with:
1519
ref: ${{ github.event.release.target_commitish }}
1620
- run: git fetch --force --tags
17-
- uses: actions/setup-node@v3
21+
- uses: actions/setup-node@v4
1822
with:
19-
node-version: 18
23+
node-version: 24
2024
registry-url: 'https://registry.npmjs.org'
21-
- run: npm install
25+
- run: npm ci
2226
- run: npm run publish-please-only
23-
env:
24-
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
2527
docker-publish:
2628
needs: npm-publish
2729
runs-on: ubuntu-latest
2830
environment: release
2931
steps:
30-
- uses: actions/checkout@v3
32+
- uses: actions/checkout@v4
3133
with:
3234
ref: ${{ github.event.release.target_commitish }}
3335
- run: git fetch --force --tags
34-
- uses: actions/setup-node@v3
36+
- uses: actions/setup-node@v4
3537
with:
36-
node-version: 18
38+
node-version: 24
3739
registry-url: 'https://registry.npmjs.org'
38-
- uses: docker/login-action@v1
40+
- uses: docker/login-action@v3
3941
with:
4042
username: ${{ secrets.DOCKERHUB_USERNAME }}
4143
password: ${{ secrets.DOCKERHUB_TOKEN }}
42-
- run: npm install
44+
- run: npm ci
4345
- run: npx gulp build
44-
- run: gulp docker-publish
45-
env:
46-
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
46+
- run: gulp docker-publish

docker/Dockerfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM alpine:3.21
1+
FROM alpine:3.23
22
ARG packageId
33

44
COPY ${packageId} /opt/testcafe/${packageId}
@@ -8,8 +8,6 @@ ENV ALPINE_REPOS="\
88
--repository http://dl-cdn.alpinelinux.org/alpine/edge/testing/\
99
--repository http://dl-cdn.alpinelinux.org/alpine/edge/community/\
1010
--repository http://dl-cdn.alpinelinux.org/alpine/edge/main/\
11-
--repository http://dl-cdn.alpinelinux.org/alpine/v3.11/community/\
12-
--repository http://dl-cdn.alpinelinux.org/alpine/v3.17/main/\
1311
"
1412

1513
RUN apk --no-cache $ALPINE_REPOS upgrade && \

gulp/helpers/test-client.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const gulp = require('gulp');
2-
const qunitHarness = require('gulp-qunit-harness');
2+
const qunitHarness = require('@devexpress/gulp-qunit-harness');
33
const { getInstallations: listBrowsers } = require('testcafe-browser-tools');
44
const { CLIENT_TEST_LOCAL_BROWSERS_ALIASES } = require('../constants/client-test-settings');
55

0 commit comments

Comments
 (0)