Skip to content

Commit

Permalink
Merge branch 'main' into maint-790
Browse files Browse the repository at this point in the history
  • Loading branch information
surchs authored Oct 29, 2024
2 parents 1d54d8e + ce01776 commit d00f833
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 26 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
uses: actions/checkout@v4

- name: Set up node env
uses: actions/setup-node@v4.0.4
uses: actions/setup-node@v4.1.0
with:
node-version: 18

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test_e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
uses: actions/checkout@v4

- name: Set up node env
uses: actions/setup-node@v4.0.4
uses: actions/setup-node@v4.1.0
with:
node-version: 16

Expand Down
59 changes: 38 additions & 21 deletions package-lock.json

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

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@
"webpack": "^4.47.0"
},
"devDependencies": {
"cy-verify-downloads": "^0.2.5",
"cypress": "^13.15.0",
"cy-verify-downloads": "^0.2.6",
"cypress": "^13.15.1",
"editorconfig": "^2.0.0",
"eslint": "^8.57.1",
"eslint-config-airbnb": "^19.0.4",
"eslint-plugin-cypress": "^3.6.0",
"eslint-plugin-vue": "^9.29.1",
"eslint-plugin-vue": "^9.30.0",
"husky": "^9.1.6",
"lint-staged": "^15.2.10",
"push-dir": "^0.4.1"
Expand Down

0 comments on commit d00f833

Please sign in to comment.