Skip to content

Commit 20cc525

Browse files
merge develop
2 parents 73dd256 + eef73c1 commit 20cc525

31 files changed

+3718
-4027
lines changed

.circleci/config.yml

Lines changed: 63 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,17 @@
88
version: 2.1
99
orbs:
1010
# use Cypress orb from CircleCI registry
11-
cypress: cypress-io/cypress@3.3.1
11+
cypress: cypress-io/cypress@3.4.2
1212
win: circleci/[email protected]
1313

1414
executors:
1515
mac:
1616
macos:
17-
xcode: "14.3.1"
17+
xcode: "15.4.0"
1818
resource_class: macos.m1.medium.gen1
1919
browsers:
2020
docker:
21-
- image: 'cypress/browsers:node-20.9.0-chrome-118.0.5993.88-1-ff-118.0.2-edge-118.0.2088.46-1'
22-
21+
- image: 'cypress/browsers:node-22.13.0-chrome-132.0.6834.83-1-ff-134.0.1-edge-131.0.2903.147-1'
2322
jobs:
2423
win-test:
2524
working_directory: ~/app
@@ -146,11 +145,63 @@ jobs:
146145
start-command: 'npm run start'
147146
cypress-command: 'npx cypress run --record --group Mac build'
148147

148+
linux-test:
149+
# checks out code and installs dependencies once
150+
# runs on 3 machines, load balances tests
151+
# and records on Cypress Cloud
152+
parallelism: 3
153+
executor:
154+
name: cypress/default
155+
node-version: '22.11.0'
156+
steps:
157+
- cypress/install:
158+
post-install: 'npm run build'
159+
- cypress/run-tests:
160+
start-command: 'npm run start'
161+
cypress-command: 'npx cypress run --record --parallel --group 3x-electron on CircleCI'
162+
- run: npx cypress cache path
163+
- run: npx cypress cache list
164+
- run: npx cypress info
165+
# let's print version info
166+
- run: npx cypress version
167+
- run: npx cypress version --component package
168+
- run: npx cypress version --component binary
169+
- run: npx cypress version --component electron
170+
- run: npx cypress version --component node
171+
172+
linux-test-chrome:
173+
# runs on 2 machines using Chrome browser
174+
parallelism: 2
175+
executor:
176+
name: cypress/default
177+
node-version: '22.11.0'
178+
steps:
179+
- cypress/install:
180+
install-browsers: true
181+
- cypress/run-tests:
182+
start-command: 'npm run start'
183+
cypress-command: 'npx cypress run --browser chrome --record --parallel --group 2x-chrome on CircleCI'
184+
185+
linux-test-firefox:
186+
# runs on 2 machines using Firefox browser
187+
parallelism: 2
188+
executor:
189+
name: cypress/default
190+
node-version: '22.11.0'
191+
steps:
192+
- cypress/install:
193+
install-browsers: true
194+
- cypress/run-tests:
195+
start-command: 'npm run start'
196+
cypress-command: 'npx cypress run --browser firefox --record --parallel --group 2x-firefox on CircleCI'
197+
149198
release:
150-
executor: cypress/default
199+
executor:
200+
name: cypress/default
201+
node-version: '22.11.0'
151202
steps:
152203
- checkout
153-
- run: npx semantic-release@21.1.2
204+
- run: npx semantic-release@23.1.1
154205

155206
workflows:
156207
win-build:
@@ -165,49 +216,16 @@ workflows:
165216

166217
linux-build:
167218
jobs:
168-
# checks out code and installs dependencies once
169-
# runs on 3 machines, load balances tests
170-
# and records on Cypress Cloud
171-
- cypress/run:
172-
name: '3 machines'
173-
post-install: 'npm run build'
174-
start-command: 'npm run start'
175-
cypress-command: 'npx cypress run --record --parallel --group 3x-electron on CircleCI'
176-
parallelism: 3
177-
post-steps:
178-
# show Cypress cache folder and binary versions
179-
# to check if we are caching previous binary versions
180-
- run: npx cypress cache path
181-
- run: npx cypress cache list
182-
- run: npx cypress info
183-
# let's print version info
184-
- run: npx cypress version
185-
- run: npx cypress version --component package
186-
- run: npx cypress version --component binary
187-
- run: npx cypress version --component electron
188-
- run: npx cypress version --component node
189-
190-
# run on 2 machines using Chrome browser
191-
- cypress/run:
192-
name: '2 machines using Chrome'
193-
start-command: 'npm run start'
194-
install-browsers: true
195-
cypress-command: 'npx cypress run --browser chrome --record --parallel --group 2x-chrome on CircleCI'
196-
parallelism: 2
197-
198-
- cypress/run:
199-
name: '2 machines using Firefox'
200-
start-command: 'npm run start'
201-
install-browsers: true
202-
cypress-command: 'npx cypress run --browser firefox --record --parallel --group 2x-firefox on CircleCI'
203-
parallelism: 2
219+
- linux-test
220+
- linux-test-chrome
221+
- linux-test-firefox
204222

205223
- release:
206224
filters:
207225
branches:
208226
only:
209227
- master
210228
requires:
211-
- 3 machines
212-
- 2 machines using Chrome
213-
- 2 machines using Firefox
229+
- linux-test
230+
- linux-test-chrome
231+
- linux-test-firefox

.eslintrc

Lines changed: 0 additions & 21 deletions
This file was deleted.

.github/workflows/chrome-docker.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ on: [push, workflow_dispatch]
55
jobs:
66
# run Chrome inside a Docker container
77
chrome:
8-
runs-on: ubuntu-22.04
8+
runs-on: ubuntu-24.04
99
# https://github.com/cypress-io/cypress-docker-images
10-
container: cypress/browsers:node-20.9.0-chrome-118.0.5993.88-1-ff-118.0.2-edge-118.0.2088.46-1
10+
container: cypress/browsers:node-22.11.0-chrome-130.0.6723.69-1-ff-132.0-edge-130.0.2849.56-1
1111
steps:
1212
- name: Checkout
1313
uses: actions/checkout@v4

.github/workflows/chrome.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,14 @@ on: [push, workflow_dispatch]
44

55
jobs:
66
chrome:
7-
runs-on: ubuntu-22.04
7+
runs-on: ubuntu-24.04
88
steps:
99
- name: Checkout
1010
uses: actions/checkout@v4
11+
- name: Set up Node.js
12+
uses: actions/setup-node@v4
13+
with:
14+
node-version-file: .node-version
1115
- name: Chrome
1216
uses: cypress-io/github-action@v6
1317
timeout-minutes: 10

.github/workflows/parallel.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,16 @@ on: [push, workflow_dispatch]
1111
jobs:
1212
install:
1313
name: Install npm and Cypress
14-
runs-on: ubuntu-22.04
14+
runs-on: ubuntu-24.04
1515
steps:
1616
- uses: actions/checkout@v4
1717

1818
# install a specific version of Node using
1919
# https://github.com/actions/setup-node
20-
- name: Use Node.js 20
20+
- name: Set up Node.js
2121
uses: actions/setup-node@v4
2222
with:
23-
node-version: 20
23+
node-version-file: .node-version
2424

2525
# just so we learn about available environment variables GitHub provides
2626
- name: Print CI env variables
@@ -76,17 +76,17 @@ jobs:
7676
# anchor definitions yet, thus we cannot put same steps into a template object yet
7777
test1:
7878
name: Cypress test 1
79-
runs-on: ubuntu-22.04
79+
runs-on: ubuntu-24.04
8080
needs: install
8181
steps:
8282
- uses: actions/checkout@v4
8383

8484
# install a specific version of Node using
8585
# https://github.com/actions/setup-node
86-
- name: Use Node.js 20
86+
- name: Set up Node.js
8787
uses: actions/setup-node@v4
8888
with:
89-
node-version: 20
89+
node-version-file: .node-version
9090

9191
# Restore just local node_modules and the Cypress binary archives.
9292
- name: Cache Cypress binary
@@ -135,17 +135,17 @@ jobs:
135135

136136
test2:
137137
name: Cypress test 2
138-
runs-on: ubuntu-22.04
138+
runs-on: ubuntu-24.04
139139
needs: install
140140
steps:
141141
- uses: actions/checkout@v4
142142

143143
# install a specific version of Node using
144144
# https://github.com/actions/setup-node
145-
- name: Use Node.js 20
145+
- name: Set up Node.js
146146
uses: actions/setup-node@v4
147147
with:
148-
node-version: 20
148+
node-version-file: .node-version
149149

150150
# Restore just local node_modules and the Cypress binary archives.
151151
- name: Cache Cypress binary

.github/workflows/single.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@ on: [push, workflow_dispatch]
77
jobs:
88
test1:
99
name: Cypress test
10-
runs-on: ubuntu-22.04
10+
runs-on: ubuntu-24.04
1111
steps:
1212
- uses: actions/checkout@v4
1313

1414
# install a specific version of Node using
1515
# https://github.com/actions/setup-node
16-
- name: Use Node.js 20
16+
- name: Set up Node.js
1717
uses: actions/setup-node@v4
1818
with:
19-
node-version: 20
19+
node-version-file: .node-version
2020

2121
# just so we learn about available environment variables GitHub provides
2222
- name: Print env variables

.github/workflows/using-action.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on: [push, workflow_dispatch]
66

77
jobs:
88
single-run:
9-
runs-on: ubuntu-22.04
9+
runs-on: ubuntu-24.04
1010
steps:
1111
- name: Checkout
1212
uses: actions/checkout@v4
@@ -19,7 +19,7 @@ jobs:
1919

2020
parallel-runs:
2121
name: Parallel 4x
22-
runs-on: ubuntu-22.04
22+
runs-on: ubuntu-24.04
2323
strategy:
2424
# when one test fails, DO NOT cancel the other
2525
# containers, because this will kill Cypress processes
@@ -64,7 +64,7 @@ jobs:
6464
matrix:
6565
# run 2 copies of the current job in parallel
6666
# and they will load balance all specs
67-
os: ['ubuntu-22.04', 'windows-latest', 'macos-latest']
67+
os: ['ubuntu-24.04', 'windows-latest', 'macos-latest']
6868
containers: [1, 2]
6969
runs-on: ${{ matrix.os }}
7070
steps:

.gitlab-ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ cache:
2020

2121
# this job installs npm dependencies and Cypress
2222
install:
23-
image: cypress/base:20.11.1
23+
image: cypress/base:22.11.0
2424
stage: build
2525

2626
script:
@@ -35,7 +35,7 @@ install:
3535

3636
# all jobs that actually run tests can use the same definition
3737
.job_template:
38-
image: cypress/base:20.11.1
38+
image: cypress/base:22.11.0
3939
stage: test
4040
script:
4141
# print CI environment variables for reference

.node-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20
1+
22

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# https://documentation.codeship.com/pro/languages-frameworks/nodejs/
33

44
# use Cypress provided image with all dependencies included
5-
FROM cypress/base:20.11.1
5+
FROM cypress/base:22.11.0
66
RUN node --version
77
RUN npm --version
88
WORKDIR /home/node/app

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ pipeline {
3737
agent {
3838
// this image provides everything needed to run Cypress
3939
docker {
40-
image 'cypress/base:20.9.0'
40+
image 'cypress/base:22.11.0'
4141
}
4242
}
4343

0 commit comments

Comments
 (0)