Merge pull request #553 from GluuFederation/branch_merger

feat: update branch merger

.github/workflows/branchmerger.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@master
-      - name: Merge master -> version_4.5.1
+      - name: Merge master -> version_4.5.4
         uses: devmasx/[email protected]
         with:
           type: now

.github/workflows/codecov.yml

@@ -23,31 +23,30 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [14.x, 16.x]
+        node-version: [18.x, 20.x]
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
-    # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-    - uses: actions/checkout@v2
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
-      with:
-        node-version: ${{ matrix.node-version }}
-
-    # due to bug in npm we have to add this config
-    # bugs https://github.com/actions/setup-node/issues/214 https://github.com/npm/cli/issues/2610
-    - name: Reconfigure git to use HTTP authentication
-      run: git config --global url."https://github.com/".insteadOf ssh://[email protected]/
-
-    - name: Build,Test and Generate coverage report
-      run: |
-        npm ci
-        npm run build --if-present
-        npm test
-        npm run cover
-
-    - name: Upload to codecov
-      uses: codecov/[email protected]
-      with:
-        file: ./coverage.lcov
-
+      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+      - uses: actions/checkout@v2
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node-version }}
+
+      # due to bug in npm we have to add this config
+      # bugs https://github.com/actions/setup-node/issues/214 https://github.com/npm/cli/issues/2610
+      - name: Reconfigure git to use HTTP authentication
+        run: git config --global url."https://github.com/".insteadOf ssh://[email protected]/
+
+      - name: Build,Test and Generate coverage report
+        run: |
+          npm ci
+          npm run build --if-present
+          npm test
+          npm run cover
+
+      - name: Upload to codecov
+        uses: codecov/[email protected]
+        with:
+          file: ./coverage.lcov

.github/workflows/lint.yml

@@ -2,31 +2,30 @@ name: Code Linting
 
 on:
   push:
-    branches: [ master ]
+    branches: [master]
   pull_request:
-    branches: [ master ]
+    branches: [master]
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
 
     strategy:
       matrix:
-        node-version: [14.x, 16.x
+        node-version: [18.x, 20.x]
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
-      with:
-        node-version: ${{ matrix.node-version }}
-    
-    # due to bug in npm we have to add this config
-    # bugs https://github.com/actions/setup-node/issues/214 https://github.com/npm/cli/issues/2610
-    - name: Reconfigure git to use HTTP authentication
-      run: git config --global url."https://github.com/".insteadOf ssh://[email protected]/
+      - uses: actions/checkout@v2
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node-version }}
+
+      # due to bug in npm we have to add this config
+      # bugs https://github.com/actions/setup-node/issues/214 https://github.com/npm/cli/issues/2610
+      - name: Reconfigure git to use HTTP authentication
+        run: git config --global url."https://github.com/".insteadOf ssh://[email protected]/
 
-    - run: npm ci
-    - run: npm run build --if-present
-    - run: npm run lint
+      - run: npm ci
+      - run: npm run build --if-present
+      - run: npm run lint

package.json

@@ -10,7 +10,7 @@
     ]
   },
   "engines": {
-    "node": ">=14 <=18"
+    "node": ">=14 <=20"
   },
   "scripts": {
     "start": "NODE_ENV=production node server/app.js",
@@ -113,4 +113,4 @@
       "path": "./node_modules/cz-conventional-changelog"
     }
   }
-}
+}