Skip to content

Commit

Permalink
Merge main to develop
Browse files Browse the repository at this point in the history
  • Loading branch information
bpmn-io-bot committed Apr 9, 2024
2 parents b0f306b + 81b8548 commit 376529f
Show file tree
Hide file tree
Showing 7 changed files with 57 additions and 57 deletions.
18 changes: 9 additions & 9 deletions .github/workflows/TASKLIST_CARBONISATION.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
name: Run visual regression
runs-on: ubuntu-latest
container:
image: mcr.microsoft.com/playwright:v1.40.1
image: mcr.microsoft.com/playwright:v1.43.0
options: --user 1001:1000
steps:
- name: Checkout form-js
Expand All @@ -36,7 +36,7 @@ jobs:
with:
node-version: "20"
cache: "yarn"
cache-dependency-path: ./tasklist/client/yarn.lock
cache-dependency-path: ./tasklist/tasklist/client/yarn.lock
- name: Install form-js deps
run: npm ci
working-directory: ./form-js
Expand All @@ -48,28 +48,28 @@ jobs:
working-directory: ./form-js/packages/form-js-viewer
- name: Link form-js-viewer
run: yarn link "@bpmn-io/form-js-viewer"
working-directory: ./tasklist/client
working-directory: ./tasklist/tasklist/client
- name: Create form-js-carbon-styles link
run: yarn link
working-directory: ./form-js/packages/form-js-carbon-styles
- name: Link form-js-carbon-styles
run: yarn link "@bpmn-io/form-js-carbon-styles"
working-directory: ./tasklist/client
working-directory: ./tasklist/tasklist/client
- name: Install Tasklist deps
run: yarn
working-directory: ./tasklist/client
working-directory: ./tasklist/tasklist/client
- name: Build Tasklist
run: yarn build:visual-regression
working-directory: ./tasklist/client
working-directory: ./tasklist/tasklist/client
- name: Start server
working-directory: ./tasklist/client
working-directory: ./tasklist/tasklist/client
run: yarn start:visual-regression &
- name: Run Playwright tests
working-directory: ./tasklist/client
working-directory: ./tasklist/tasklist/client
run: yarn playwright form-js-integration
- uses: actions/upload-artifact@ef09cdac3e2d3e60d8ccadda691f4f1cec5035cb
if: always()
with:
name: playwright-report
path: ./tasklist/client/playwright-report/
path: ./tasklist/tasklist/client/playwright-report/
retention-days: 30
44 changes: 22 additions & 22 deletions .github/workflows/UPDATE_VISUAL_SNAPSHOTS.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,28 +9,28 @@ jobs:
if: github.event.pull_request.state != 'closed' && (github.event.label.name == 'update-snapshots' || contains( github.event.pull_request.labels.*.name, 'update-snapshots'))
runs-on: ubuntu-latest
container:
image: mcr.microsoft.com/playwright:v1.40.1
image: mcr.microsoft.com/playwright:v1.43.0
options: --user 1001:1000

steps:
- name: Check out repository code
uses: actions/checkout@v4
- name: Setup NPM cache
uses: actions/setup-node@v4
with:
node-version: "20"
cache: "npm"
- name: Install node dependencies
run: npm ci
- name: Build frontend
run: npm run build
- name: Build mock website
run: npm run build:e2e
- name: Start server
run: npm run start:visual-preview
- name: Run Playwright tests
run: npm run test:visual -- --update-snapshots
- name: Commit screenshots
uses: stefanzweifel/git-auto-commit-action@v5
with:
commit_message: "chore: updated snapshots"
- name: Check out repository code
uses: actions/checkout@v4
- name: Setup NPM cache
uses: actions/setup-node@v4
with:
node-version: "20"
cache: "npm"
- name: Install node dependencies
run: npm ci
- name: Build frontend
run: npm run build
- name: Build mock website
run: npm run build:e2e
- name: Start server
run: npm run start:visual-preview
- name: Run Playwright tests
run: npm run test:visual -- --update-snapshots
- name: Commit screenshots
uses: stefanzweifel/git-auto-commit-action@v5
with:
commit_message: "chore: updated snapshots"
2 changes: 1 addition & 1 deletion .github/workflows/VISUAL_REGRESSION.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ jobs:
test:
runs-on: ubuntu-latest
container:
image: mcr.microsoft.com/playwright:v1.40.1
image: mcr.microsoft.com/playwright:v1.43.0
options: --user 1001:1000
steps:
- name: Check out repository code
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
46 changes: 23 additions & 23 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"test:visual": "playwright test visual",
"build:e2e": "vite build",
"start:visual-preview": "vite preview --port 8080 --logLevel silent &",
"start:container": "docker run --rm --network host -v $(pwd):/work/ -w /work/ -it mcr.microsoft.com/playwright:v1.40.1 /bin/bash"
"start:container": "docker run --rm --network host -v $(pwd):/work/ -w /work/ -it mcr.microsoft.com/playwright:v1.43.0 /bin/bash"
},
"repository": {
"type": "git",
Expand Down Expand Up @@ -66,7 +66,7 @@
"@bpmn-io/properties-panel": "^3.18.2",
"@carbon/react": "^1.42.1",
"@carbon/styles": "^1.42.1",
"@playwright/test": "^1.40.1",
"@playwright/test": "^1.43.0",
"@rollup/plugin-alias": "^5.0.0",
"@rollup/plugin-babel": "^6.0.0",
"@rollup/plugin-commonjs": "^25.0.0",
Expand Down

0 comments on commit 376529f

Please sign in to comment.