Skip to content

Commit a2cf4cc

Browse files
authored
Merge pull request #1331 from thewtex/cypress-bump
cypress bump
2 parents 504c573 + 4147e8b commit a2cf4cc

5 files changed

Lines changed: 63 additions & 53 deletions

File tree

.github/workflows/cypress.yml

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616

1717
test-cypress:
1818
name: browser tests
19-
runs-on: ubuntu-22.04
19+
runs-on: ubuntu-24.04
2020
strategy:
2121
max-parallel: 3
2222
matrix:
@@ -36,14 +36,19 @@ jobs:
3636
run: |
3737
./src/docker/pull.sh --no-debug
3838
39-
- uses: actions/setup-node@v4
40-
with:
41-
node-version: '20'
42-
4339
- name: Install
4440
uses: pnpm/action-setup@v4
41+
42+
- uses: actions/setup-node@v4
4543
with:
46-
run_install: true
44+
node-version: '22'
45+
cache: pnpm
46+
cache-dependency-path: ./pnpm-lock.yaml
47+
48+
- name: Install node, cypress
49+
run: |
50+
pnpm install --frozen-lockfile
51+
pnpx cypress install
4752
4853
- name: Build itk-wasm
4954
run: |
@@ -103,7 +108,7 @@ jobs:
103108

104109
test-itk-wasm-cypress:
105110
name: itk-wasm browser tests
106-
runs-on: ubuntu-22.04
111+
runs-on: ubuntu-24.04
107112

108113
steps:
109114
- name: Checkout
@@ -119,14 +124,19 @@ jobs:
119124
run: |
120125
./src/docker/pull.sh --no-debug
121126
122-
- uses: actions/setup-node@v4
123-
with:
124-
node-version: '20'
125-
126127
- name: Install
127128
uses: pnpm/action-setup@v4
129+
130+
- uses: actions/setup-node@v4
128131
with:
129-
run_install: true
132+
node-version: '22'
133+
cache: pnpm
134+
cache-dependency-path: ./pnpm-lock.yaml
135+
136+
- name: Install node, cypress
137+
run: |
138+
pnpm install --frozen-lockfile
139+
pnpx cypress install
130140
131141
- name: Build itk-wasm
132142
run: |

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "itk-wasm-workspace",
33
"version": "1.0.0",
44
"private": true,
5-
"packageManager": "pnpm@9.9.0",
5+
"packageManager": "pnpm@10.4.0",
66
"description": "High-performance spatial analysis in a web browser, Node.js, and reproducible execution across programming languages and hardware architectures.",
77
"type": "module",
88
"directories": {
@@ -42,7 +42,7 @@
4242
"@shoelace-style/shoelace": "^2.12.0",
4343
"start-server-and-test": "^2.0.4",
4444
"ava": "^6.1.3",
45-
"cypress": "^13.17.0"
45+
"cypress": "^14.0.3"
4646
}
4747
},
4848
"commitlint": {

packages/core/typescript/itk-wasm/src/pipeline/internal/load-emscripten-module-main-thread.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import RunPipelineOptions from '../run-pipeline-options.js'
88
const decoder = new ZSTDDecoder()
99
let decoderInitialized = false
1010

11-
async function loadEmscriptenModuleMainThread(
11+
async function loadEmscriptenModuleMainThread (
1212
moduleRelativePathOrURL: string | URL,
1313
baseUrl?: string,
1414
queryParams?: RunPipelineOptions['pipelineQueryParams']

packages/core/typescript/itk-wasm/src/pipeline/internal/load-emscripten-module-web-worker.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ let decoderInitialized = false
1212
//
1313
// baseUrl is usually taken from 'getPipelinesBaseUrl()', but a different value
1414
// could be passed.
15-
async function loadEmscriptenModuleWebWorker(
15+
async function loadEmscriptenModuleWebWorker (
1616
moduleRelativePathOrURL: string | URL,
1717
baseUrl: string,
1818
queryParams?: RunPipelineOptions['pipelineQueryParams']

pnpm-lock.yaml

Lines changed: 37 additions & 37 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)