Skip to content

Commit d1ec8b7

Browse files
authored
Merge branch '3.x' into 3.x
2 parents 845c0e4 + 0025e2c commit d1ec8b7

File tree

7 files changed

+68
-47
lines changed

7 files changed

+68
-47
lines changed

.github/workflows/acceptance-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
# Install Docker Compose
3030
- name: Install Docker Compose
3131
run: |
32-
sudo apt-get update
32+
sudo apt-get update --allow-releaseinfo-change
3333
sudo apt-get install -y docker-compose
3434
3535
# Run rest tests using docker-compose

.github/workflows/docker.yml

Lines changed: 23 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,24 @@ jobs:
99
push_to_registry:
1010
name: Build and push Docker image to Docker Hub
1111
runs-on: ubuntu-22.04
12-
if: startsWith(github.event.ref_name, 'release-')
12+
env:
13+
DOCKER_REPO: ${{ secrets.DOCKERHUB_USERNAME }}/${{ secrets.DOCKERHUB_REPOSITORY }}
1314

1415
steps:
15-
- name: Check out the repo with the latest code
16+
- name: Fetch full Git history and tags
1617
uses: actions/checkout@v4
18+
with:
19+
fetch-depth: 0
20+
21+
- name: Get the latest tag
22+
id: get_tag
23+
run: |
24+
TAG=$(git describe --tags `git rev-list --tags --max-count=1`)
25+
echo "TAG=$TAG" >> $GITHUB_ENV
26+
echo "::set-output name=tag::$TAG"
27+
28+
- name: Checkout latest tag
29+
run: git checkout tags/${{ env.TAG }}
1730

1831
- name: Set up Docker Buildx
1932
uses: docker/setup-buildx-action@v3
@@ -24,19 +37,19 @@ jobs:
2437
username: ${{ secrets.DOCKERHUB_USERNAME }}
2538
password: ${{ secrets.DOCKERHUB_PASSWORD }}
2639

27-
- name: Get the current tag
28-
id: currentTag
40+
- name: Check if Docker tag exists
41+
id: tag_check
2942
run: |
30-
git fetch --prune --unshallow
31-
TAG=$(git describe --tags --abbrev=0)
32-
echo $TAG
33-
echo "TAG=$TAG" >> $GITHUB_ENV
43+
TAG_EXISTS=$(curl -s -o /dev/null -w "%{http_code}" \
44+
https://hub.docker.com/v2/repositories/${DOCKER_REPO}/tags/${TAG}/)
45+
echo "exists=$TAG_EXISTS" >> $GITHUB_OUTPUT
3446
3547
- name: Build and push Docker image
48+
if: steps.tag_check.outputs.exists != '200'
3649
uses: docker/build-push-action@v6
3750
with:
3851
context: .
3952
push: true
4053
tags: |
41-
${{ secrets.DOCKERHUB_REPOSITORY }}:latest
42-
${{ secrets.DOCKERHUB_REPOSITORY }}:${{ env.TAG }}
54+
${{ env.DOCKER_REPO }}:latest
55+
${{ env.DOCKER_REPO }}:${{ env.TAG }}

.github/workflows/playwright.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@ jobs:
3535
npm i --force
3636
env:
3737
PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: true
38+
- name: Allow Release info Change
39+
run: |
40+
sudo apt-get update --allow-releaseinfo-change
3841
- name: Install browsers and deps
3942
run: npx playwright install && npx playwright install-deps
4043
- name: check

.github/workflows/plugin.yml

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -15,30 +15,32 @@ env:
1515

1616
jobs:
1717
build:
18-
1918
runs-on: ubuntu-22.04
2019

2120
strategy:
2221
matrix:
2322
node-version: [20.x]
2423

2524
steps:
26-
- uses: actions/checkout@v4
27-
- name: Use Node.js ${{ matrix.node-version }}
28-
uses: actions/setup-node@v4
29-
with:
30-
node-version: ${{ matrix.node-version }}
31-
- uses: shivammathur/setup-php@v2
32-
with:
33-
php-version: 7.4
34-
- name: npm install
35-
run: |
36-
npm i --force
37-
env:
38-
PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: true
39-
- name: Install browsers and deps
40-
run: npx playwright install chromium && npx playwright install-deps
41-
- name: start a server
42-
run: "php -S 127.0.0.1:8000 -t test/data/app &"
43-
- name: run plugin tests
44-
run: npm run test:plugin
25+
- uses: actions/checkout@v4
26+
- name: Use Node.js ${{ matrix.node-version }}
27+
uses: actions/setup-node@v4
28+
with:
29+
node-version: ${{ matrix.node-version }}
30+
- uses: shivammathur/setup-php@v2
31+
with:
32+
php-version: 7.4
33+
- name: npm install
34+
run: |
35+
npm i --force
36+
env:
37+
PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: true
38+
- name: Allow Release info Change
39+
run: |
40+
sudo apt-get update --allow-releaseinfo-change
41+
- name: Install browsers and deps
42+
run: npx playwright install chromium && npx playwright install-deps
43+
- name: start a server
44+
run: 'php -S 127.0.0.1:8000 -t test/data/app &'
45+
- name: run plugin tests
46+
run: npm run test:plugin

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ examples/output
1616
examples/selenoid-example/output
1717
test/data/app/db
1818
test/data/sandbox/steps.d.ts
19+
test/data/sandbox/configs/custom-reporter-plugin/output/result.json
1920
testpullfilecache*
2021
.DS_Store
2122
package-lock.json

Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
FROM mcr.microsoft.com/playwright:v1.48.1-noble
33
ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD true
44

5+
RUN apt-get update --allow-releaseinfo-change
6+
57
# Installing the pre-required packages and libraries
68
RUN apt-get update && \
79
apt-get install -y libgtk2.0-0 \

package.json

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
"@codeceptjs/configure": "1.0.4",
7979
"@codeceptjs/helper": "2.0.4",
8080
"@cucumber/cucumber-expressions": "18",
81-
"@cucumber/gherkin": "32",
81+
"@cucumber/gherkin": "32.1.0",
8282
"@cucumber/messages": "27.2.0",
8383
"@xmldom/xmldom": "0.9.8",
8484
"acorn": "8.14.1",
@@ -106,8 +106,7 @@
106106
"lodash.merge": "4.6.2",
107107
"mkdirp": "3.0.1",
108108
"mocha": "11.1.0",
109-
"mochawesome": "^7.1.3",
110-
"monocart-coverage-reports": "2.12.3",
109+
"monocart-coverage-reports": "2.12.4",
111110
"ms": "2.1.3",
112111
"ora-classic": "5.4.2",
113112
"parse-function": "5.6.10",
@@ -125,25 +124,25 @@
125124
"@codeceptjs/expect-helper": "^1.0.2",
126125
"@codeceptjs/mock-request": "0.3.1",
127126
"@eslint/eslintrc": "3.3.1",
128-
"@eslint/js": "9.23.0",
127+
"@eslint/js": "9.24.0",
129128
"@faker-js/faker": "9.6.0",
130129
"@pollyjs/adapter-puppeteer": "6.0.6",
131130
"@pollyjs/core": "6.0.6",
132131
"@types/chai": "5.2.1",
133132
"@types/inquirer": "9.0.7",
134-
"@types/node": "22.14.0",
135-
"@wdio/sauce-service": "9.12.4",
133+
"@types/node": "22.14.1",
134+
"@wdio/sauce-service": "9.12.5",
136135
"@wdio/selenium-standalone-service": "8.15.0",
137-
"@wdio/utils": "9.12.2",
136+
"@wdio/utils": "9.12.5",
138137
"@xmldom/xmldom": "0.9.8",
139138
"chai": "^4.0.0",
140139
"chai-as-promised": "7.1.2",
141140
"chai-subset": "1.6.0",
142141
"documentation": "14.0.3",
143-
"electron": "35.1.4",
144-
"eslint": "^9.21.0",
142+
"electron": "35.2.0",
143+
"eslint": "^9.24.0",
145144
"eslint-plugin-import": "2.31.0",
146-
"eslint-plugin-mocha": "10.5.0",
145+
"eslint-plugin-mocha": "11.0.0",
147146
"expect": "29.7.0",
148147
"express": "5.1.0",
149148
"globals": "16.0.0",
@@ -154,9 +153,10 @@
154153
"jsdoc": "^3.6.11",
155154
"jsdoc-typeof-plugin": "1.0.0",
156155
"json-server": "0.17.4",
157-
"playwright": "1.51.1",
156+
"mochawesome": "^7.1.3",
157+
"playwright": "1.52.0",
158158
"prettier": "^3.3.2",
159-
"puppeteer": "24.5.0",
159+
"puppeteer": "24.8.0",
160160
"qrcode-terminal": "0.12.0",
161161
"rosie": "2.1.1",
162162
"runok": "0.9.3",
@@ -166,13 +166,13 @@
166166
"testcafe": "3.7.2",
167167
"ts-morph": "25.0.1",
168168
"ts-node": "10.9.2",
169-
"tsd": "^0.31.0",
169+
"tsd": "^0.32.0",
170170
"tsd-jsdoc": "2.5.0",
171-
"typedoc": "0.28.2",
172-
"typedoc-plugin-markdown": "4.6.1",
171+
"typedoc": "0.28.3",
172+
"typedoc-plugin-markdown": "4.6.3",
173173
"typescript": "5.8.3",
174174
"wdio-docker-service": "3.2.1",
175-
"webdriverio": "9.12.2",
175+
"webdriverio": "9.12.5",
176176
"xml2js": "0.6.2",
177177
"xpath": "0.0.34"
178178
},

0 commit comments

Comments
 (0)