Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/release/2.9' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
petrjasek committed Mar 11, 2025
2 parents c3a3596 + 456353a commit 340e5c9
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ jobs:
working-directory: e2e/client
# playwright start
- name: Install Playwright Browsers
run: npx playwright install --with-deps
run: npx playwright install
working-directory: e2e/client
- name: Run Playwright tests
run: npx playwright test
run: npm run playwright
working-directory: e2e/client
- uses: actions/upload-artifact@v4
if: ${{ failure() }}
Expand Down
3 changes: 2 additions & 1 deletion e2e/client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,15 @@
"@playwright/test": "~1.47.0",
"@superdesk/build-tools": "file:../../build-tools",
"@superdesk/end-to-end-testing-helpers": "1.0.11",
"@types/node": "~20.8.9",
"btoa": "1.2.1",
"grunt": "1.3.0",
"http-server": "14.1.1",
"jasmine-reporters": "2.5.2",
"protractor": "7.0.0",
"protractor-flake": "4.0.0",
"typescript": "4.9.3",
"webdriver-manager": "^12.1.9"
"webdriver-manager": "~12.1.9"
},
"scripts": {
"build": "npx @superdesk/build-tools build-root-repo ./",
Expand Down
2 changes: 1 addition & 1 deletion e2e/server/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ vine==5.1.0
# kombu
wcwidth==0.2.13
# via prompt-toolkit
websockets==15.0
websockets==15.0.1
# via superdesk-core
werkzeug==1.0.1
# via
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "superdesk-core",
"version": "2.8.3",
"version": "2.9.0-rc.1",
"license": "AGPL-3.0",
"repository": {
"type": "git",
Expand Down

0 comments on commit 340e5c9

Please sign in to comment.