Skip to content

Commit e193cad

Browse files
JakshasJakshas
committed
Merge branch 'main' into SBVT-2830
2 parents 83995db + 5e991ee commit e193cad

16 files changed

+113
-7805
lines changed

‎.github/workflows/browser_test.yml‎

Lines changed: 45 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ jobs:
77
strategy:
88
fail-fast: false
99
matrix:
10-
browser: [ firefox, chrome, 'chrome:beta', edge ]
11-
# browser: [ firefox, chrome, edge ] #chrome beta causing issues
10+
browser: [ firefox, chrome-for-testing, edge ] #chrome beta causing issues
1211

1312
steps:
1413
- name: Checkout code
@@ -20,23 +19,40 @@ jobs:
2019
BRANCH_NAME=$(echo "${{ github.ref }}" | awk -F'/' '{print $3}')
2120
echo "::set-output name=TEST_RUN_NAME::${{ matrix.browser }}-${{ github.workflow }}—$BRANCH_NAME"
2221
22+
- name: Setup Edge
23+
if: ${{ startsWith(matrix.browser, 'edge') }}
24+
id: setup-edge
25+
uses: browser-actions/setup-edge@v1
26+
27+
- name: Print Edge location
28+
if: ${{ startsWith(matrix.browser, 'edge') }}
29+
run: cat ${{ steps.setup-edge.outputs.edge-path }}
30+
31+
- name: Setup Chrome
32+
if: ${{ startsWith(matrix.browser, 'chrome') }}
33+
uses: browser-actions/setup-chrome@v2
34+
with:
35+
install-dependencies: true
36+
37+
- name: Setup Firefox
38+
if: ${{ startsWith(matrix.browser, 'firefox') }}
39+
uses: browser-actions/setup-firefox@v1
40+
41+
- name: Install node version 24
42+
uses: actions/setup-node@v3
43+
with:
44+
node-version: '24'
45+
2346
- name: Install root dependencies
2447
run: npm install
2548

2649
- name: Install test dependencies
2750
run: npm install
2851
working-directory: ./test
2952

30-
- name: Install Chrome Beta
31-
if: ${{ startsWith(matrix.browser, 'chrome') }}
32-
run: |
33-
curl -sS -o - https://dl-ssl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
34-
echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" | sudo tee /etc/apt/sources.list.d/google-chrome-beta.list
35-
sudo apt-get update
36-
sudo apt-get install google-chrome-beta
37-
38-
- name: Cypress run
39-
uses: cypress-io/github-action@v5
53+
- name: Cypress run chrome or firefox
54+
if: ${{ matrix.browser == 'chrome-for-testing' || startsWith(matrix.browser, 'firefox') }}
55+
uses: cypress-io/github-action@v6
4056
with:
4157
quiet: true
4258
working-directory: ./test
@@ -50,3 +66,20 @@ jobs:
5066
SBVT_SCM_BRANCH: ${{ github.head_ref || github.ref_name }}
5167
SBVT_SCM_COMMIT_ID: ${{ github.sha }}
5268
DEBUG: TRUE
69+
70+
- name: Cypress run edge
71+
if: ${{ startsWith(matrix.browser, 'edge') }}
72+
uses: cypress-io/github-action@v6
73+
with:
74+
quiet: true
75+
working-directory: ./test
76+
spec: cypress/e2e/test-spec/quick-test_*
77+
browser: ${{ steps.setup-edge.outputs.edge-path }}
78+
79+
env:
80+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
81+
PROJECT_TOKEN: ${{ secrets.DEV_EXAMPLE_7 }}
82+
TEST_RUN_NAME: ${{ steps.set-test-run-name.outputs.TEST_RUN_NAME }}
83+
SBVT_SCM_BRANCH: ${{ github.head_ref || github.ref_name }}
84+
SBVT_SCM_COMMIT_ID: ${{ github.sha }}
85+
DEBUG: TRUE

‎.github/workflows/cypress_version-test.yml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@ jobs:
1313
- name: Checkout
1414
uses: actions/checkout@v4
1515

16+
- name: Install node version 24
17+
uses: actions/setup-node@v3
18+
with:
19+
node-version: '24'
20+
1621
- name: Extract Branch Name and Set Test Run Name
1722
id: set-test-run-name
1823
run: |
@@ -56,7 +61,6 @@ jobs:
5661
working-directory: ./test/version-control-test/above10
5762
run: npx jest
5863

59-
6064
- name: Cypress run
6165
if: ${{ startsWith(matrix.cypress-version, '10') || startsWith(matrix.cypress-version, '11') || startsWith(matrix.cypress-version, '12') || startsWith(matrix.cypress-version, 'dev') || startsWith(matrix.cypress-version, 'latest') }}
6266
uses: cypress-io/github-action@v5

‎.github/workflows/linux_quick-test.yaml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@ jobs:
1515
BRANCH_NAME=$(echo "${{ github.ref }}" | awk -F'/' '{print $3}')
1616
echo "::set-output name=TEST_RUN_NAME::${{ github.workflow }}—$BRANCH_NAME"
1717
18+
- name: Install node version 24
19+
uses: actions/setup-node@v3
20+
with:
21+
node-version: '24'
22+
1823
- name: Install root dependencies
1924
run: npm install
2025

@@ -23,7 +28,7 @@ jobs:
2328
working-directory: ./test
2429

2530
- name: Cypress run
26-
uses: cypress-io/github-action@v6
31+
uses: cypress-io/github-action@v6.10.2
2732
with:
2833
quiet: true
2934
working-directory: ./test

‎.github/workflows/mac_windows_quick-tests.yml‎

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

‎.github/workflows/npm-package_test.yml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,21 @@ on:
77

88
jobs:
99
cypress-run:
10-
runs-on: ${{ matrix.os }}
10+
runs-on: self-hosted
1111
strategy:
1212
fail-fast: false
1313
matrix:
14-
os: [ windows-latest, macos-latest ]
1514
browser: [ firefox, chrome ]
1615

1716
steps:
1817
- name: Checkout
1918
uses: actions/checkout@v4
2019

20+
- name: Install node version 24
21+
uses: actions/setup-node@v3
22+
with:
23+
node-version: '24'
24+
2125
- name: Install Visual Test & Cypress from NPM
2226
run: npm install cypress @smartbear/visualtest-cypress@latest
2327
working-directory: ./test/npm-package-test

‎.github/workflows/print_report-test.yml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@ jobs:
88
- name: Checkout
99
uses: actions/checkout@v4
1010

11+
- name: Install node version 24
12+
uses: actions/setup-node@v3
13+
with:
14+
node-version: '24'
15+
1116
- name: Install root dependencies
1217
run: npm install
1318

@@ -16,7 +21,7 @@ jobs:
1621
working-directory: ./test
1722

1823
- name: Install Cypress
19-
run: npm install cypress@latest
24+
run: npm install cypress
2025
working-directory: ./test
2126

2227
- name: Cypress run

‎.github/workflows/sonar-qube.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,11 @@ jobs:
1212
name: Build
1313
runs-on: self-hosted
1414
steps:
15+
- name: Install node version 24
16+
uses: actions/setup-node@v3
17+
with:
18+
node-version: '24'
19+
1520
- uses: actions/checkout@v4
1621
with:
1722
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis

‎.github/workflows/typescript-test.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,21 @@ jobs:
2121
BRANCH_NAME=$(echo "${{ github.ref }}" | awk -F'/' '{print $3}')
2222
echo "::set-output name=TEST_RUN_NAME::${{ github.workflow }}—$BRANCH_NAME"
2323
24+
- name: Install node version 24
25+
uses: actions/setup-node@v3
26+
with:
27+
node-version: '24'
28+
2429
- name: Install root dependencies
2530
run: npm install
2631

2732
- name: Install typescript-test dependencies
2833
run: npm install
2934
working-directory: ./test/typescript-test
3035

36+
- name: Install linux sharp
37+
run: npm install --include=optional sharp
38+
3139
- name: Setup visualtest
3240
run: npx visualtest-setup > visualtest-first-logs.txt
3341
working-directory: ./test/typescript-test

‎.github/workflows/violations-test.yaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@ jobs:
99
- name: Checkout
1010
uses: actions/checkout@v4
1111

12+
- name: Install node version 24
13+
uses: actions/setup-node@v3
14+
with:
15+
node-version: '24'
16+
1217
- name: Extract Branch Name and Set Test Run Name
1318
id: set-test-run-name
1419
run: |
@@ -22,6 +27,9 @@ jobs:
2227
run: npm install
2328
working-directory: ./test
2429

30+
- name: Install linux sharp
31+
run: npm install --include=optional sharp
32+
2533
- name: Cypress run
2634
uses: cypress-io/github-action@v6
2735
with:

‎.github/workflows/webkit-browser_test.yml‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: webkit-browser-check
33
on: [pull_request]
44
jobs:
55
cypress-run:
6-
runs-on: macos-latest
6+
runs-on: self-hosted
77
strategy:
88
fail-fast: false
99
matrix:
@@ -13,9 +13,17 @@ jobs:
1313
- name: Checkout code
1414
uses: actions/checkout@v4
1515

16+
- name: Install node version 24
17+
uses: actions/setup-node@v3
18+
with:
19+
node-version: '24'
20+
1621
- name: Install root dependencies
1722
run: npm install
1823

24+
- name: Install playwright dependencies
25+
run: npx playwright install-deps
26+
1927
- name: Install test dependencies
2028
run: npm install
2129
working-directory: ./test/webkit-test

0 commit comments

Comments
 (0)