ep_openid_connect 2.5.1 → 2.5.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -14,10 +14,6 @@ jobs:
14
14
  runs-on: ubuntu-latest
15
15
 
16
16
  steps:
17
- - uses: actions/setup-node@v2
18
- with:
19
- node-version: 12
20
-
21
17
  - name: Install libreoffice
22
18
  run: |
23
19
  sudo add-apt-repository -y ppa:libreoffice/ppa
@@ -30,9 +26,6 @@ jobs:
30
26
  with:
31
27
  repository: ether/etherpad-lite
32
28
 
33
- - name: Install all dependencies and symlink for ep_etherpad-lite
34
- run: src/bin/installDeps.sh
35
-
36
29
  - name: Checkout plugin repository
37
30
  uses: actions/checkout@v2
38
31
  with:
@@ -50,6 +43,15 @@ jobs:
50
43
  env:
51
44
  PLUGIN_NAME: ${{ steps.plugin_name.outputs.plugin_name }}
52
45
 
46
+ - uses: actions/setup-node@v2
47
+ with:
48
+ node-version: 12
49
+ cache: 'npm'
50
+ cache-dependency-path: |
51
+ src/package-lock.json
52
+ src/bin/doc/package-lock.json
53
+ node_modules/${{ steps.plugin_name.outputs.plugin_name }}/package-lock.json
54
+
53
55
  - name: Install plugin dependencies
54
56
  run: |
55
57
  cd ./node_modules/"${PLUGIN_NAME}"
@@ -57,5 +59,15 @@ jobs:
57
59
  env:
58
60
  PLUGIN_NAME: ${{ steps.plugin_name.outputs.plugin_name }}
59
61
 
62
+ # This must be run after setting up the plugin, otherwise npm will try to
63
+ # hoist common dependencies by removing them from src/node_modules and
64
+ # installing them in the top-level node_modules. As of v6.14.10, npm's hoist
65
+ # logic appears to be buggy, because it sometimes removes dependencies from
66
+ # src/node_modules but fails to add them to the top-level node_modules. Even
67
+ # if npm correctly hoists the dependencies, the hoisting seems to confuse
68
+ # tools such as `npm outdated`, `npm update`, and some ESLint rules.
69
+ - name: Install Etherpad core dependencies
70
+ run: src/bin/installDeps.sh
71
+
60
72
  - name: Run the backend tests
61
73
  run: cd src && npm test
@@ -15,15 +15,19 @@ jobs:
15
15
  printf %s\\n '::set-output name=name::${{github.event.repository.name}} ${{ github.workflow }} - ${{ github.job }}'
16
16
  printf %s\\n '::set-output name=tunnel_id::${{ github.run_id }}-${{ github.run_number }}-${{ github.job }}'
17
17
 
18
- - uses: actions/setup-node@v2
19
- with:
20
- node-version: 12
21
-
22
18
  - name: Check out Etherpad core
23
19
  uses: actions/checkout@v2
24
20
  with:
25
21
  repository: ether/etherpad-lite
26
22
 
23
+ - uses: actions/setup-node@v2
24
+ with:
25
+ node-version: 12
26
+ cache: 'npm'
27
+ cache-dependency-path: |
28
+ src/package-lock.json
29
+ src/bin/doc/package-lock.json
30
+
27
31
  - name: Check out the plugin
28
32
  uses: actions/checkout@v2
29
33
  with:
@@ -32,6 +32,11 @@ jobs:
32
32
  - uses: actions/setup-node@v1
33
33
  with:
34
34
  node-version: 12
35
+ cache: 'npm'
36
+ cache-dependency-path: |
37
+ ../etherpad-lite/src/package-lock.json
38
+ ../etherpad-lite/src/bin/doc/package-lock.json
39
+ package-lock.json
35
40
  # All of ep_etherpad-lite's devDependencies are installed because the
36
41
  # plugin might do `require('ep_etherpad-lite/node_modules/${devDep}')`.
37
42
  # Eventually it would be nice to create an ESLint plugin that prohibits
@@ -62,6 +67,7 @@ jobs:
62
67
  with:
63
68
  node-version: 12
64
69
  registry-url: https://registry.npmjs.org/
70
+ cache: 'npm'
65
71
  - name: Bump version (patch)
66
72
  run: |
67
73
  LATEST_TAG=$(git describe --tags --abbrev=0) || exit 1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "ep_openid_connect",
3
- "version": "2.5.1",
3
+ "version": "2.5.2",
4
4
  "description": "Etherpad plugin to authenticate users against an OpenID Connect provider.",
5
5
  "main": "index.js",
6
6
  "repository": {
@@ -54,6 +54,6 @@
54
54
  "ep_etherpad-lite": ">=1.8.6"
55
55
  },
56
56
  "engines": {
57
- "node": ">=12.13.0"
57
+ "node": ">=12.17.0"
58
58
  }
59
59
  }