Skip to content

Commit

Permalink
Merge pull request #99 from ether/bump/node
Browse files Browse the repository at this point in the history
Bumped node.
  • Loading branch information
SamTV12345 authored Oct 8, 2023
2 parents 9cd285e + fe4664c commit d475f8f
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 19 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/backend-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,14 @@ jobs:
-
uses: actions/setup-node@v3
with:
node-version: 12
node-version: 20
cache: 'npm'
cache-dependency-path: |
src/package-lock.json
src/bin/doc/package-lock.json
node_modules/${{ steps.plugin_name.outputs.plugin_name }}/package-lock.json
- run: npm install [email protected] -g
name: Install legacy npm for correct dependency resolution
-
name: Install plugin dependencies
run: |
Expand Down
17 changes: 4 additions & 13 deletions .github/workflows/frontend-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,8 @@ on: [push]
jobs:
test:
runs-on: ubuntu-latest

if: ${{ github.actor != 'dependabot[bot]' }}
steps:
-
name: Fail if Dependabot
if: github.actor == 'dependabot[bot]'
run: |
cat <<EOF >&2
Frontend tests skipped because Dependabot can't access secrets.
Manually re-run the jobs to run the frontend tests.
For more information, see:
https://github.blog/changelog/2021-02-19-github-actions-workflows-triggered-by-dependabot-prs-will-run-with-read-only-permissions/
EOF
exit 1
-
name: Generate Sauce Labs strings
id: sauce_strings
Expand All @@ -34,11 +23,13 @@ jobs:
-
uses: actions/setup-node@v3
with:
node-version: 12
node-version: 20
cache: 'npm'
cache-dependency-path: |
src/package-lock.json
src/bin/doc/package-lock.json
- run: npm install [email protected] -g
name: Install legacy npm for correct dependency resolution
-
name: Check out the plugin
uses: actions/checkout@v3
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/npmpublish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,14 @@ jobs:
-
uses: actions/setup-node@v3
with:
node-version: 12
node-version: 20
cache: 'npm'
cache-dependency-path: |
node_modules/ep_etherpad-lite/package-lock.json
node_modules/ep_etherpad-lite/bin/doc/package-lock.json
package-lock.json
- run: npm install [email protected] -g
name: Install legacy npm for correct dependency resolution
# All of ep_etherpad-lite's devDependencies are installed because the
# plugin might do `require('ep_etherpad-lite/node_modules/${devDep}')`.
# Eventually it would be nice to create an ESLint plugin that prohibits
Expand Down Expand Up @@ -83,9 +85,11 @@ jobs:
-
uses: actions/setup-node@v3
with:
node-version: 12
node-version: 20
registry-url: https://registry.npmjs.org/
cache: 'npm'
- run: npm install [email protected] -g
name: Install legacy npm for correct dependency resolution
-
name: Bump version (patch)
run: |
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
.ep_initialized
.DS_Store
npm-debug.log
node_modules/
node_modules/
.idea
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
Expand Up @@ -19,7 +19,7 @@
"type": "git",
"url": "https://github.com/ether/ep_align.git"
},
"version": "0.3.70",
"version": "0.3.71",
"funding": {
"type": "individual",
"url": "https://etherpad.org/"
Expand Down

0 comments on commit d475f8f

Please sign in to comment.