remove obsolete eslint dependencies (#2223)

* remove obsolete eslint dependencies
* update lint.yml
* update workflows

5 files changed, 27 insertions, 77 deletions

diff --git a/.github/workflows/app-code-check.yml b/.github/workflows/app-code-check.yml
deleted file mode 100644
index bd9556b0..00000000
--- a/.github/workflows/app-code-check.yml
+++ /dev/null
@@ -1,55 +0,0 @@
-name: PHP

-

-on:

-  pull_request:

-  push:

-    branches:

-      - master

-      - stable*

-

-env:

-  APP_NAME: polls

-

-jobs:

-  unit-tests:

-    runs-on: ubuntu-latest

-

-    strategy:

-      matrix:

-        php-versions: ['7.4', '8.0']

-        server-versions: ['master', 'stable21']

-

-    name: AppCode check php${{ matrix.php-versions }}-${{ matrix.server-versions }}

-    steps:

-      - name: Checkout server

-        uses: actions/checkout@v2

-        with:

-          repository: nextcloud/server

-          ref: ${{ matrix.server-versions }}

-

-      - name: Checkout submodules

-        shell: bash

-        run: |

-          auth_header="$(git config --local --get http.https://github.com/.extraheader)"

-          git submodule sync --recursive

-          git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1

-

-      - name: Checkout app

-        uses: actions/checkout@v2

-        with:

-          path: apps/${{ env.APP_NAME }}

-

-      - name: Set up php ${{ matrix.php-versions }}

-        uses: shivammathur/setup-php@v2

-        with:

-          php-version: ${{ matrix.php-versions }}

-          tools: phpunit

-          extensions: mbstring, iconv, fileinfo, intl, sqlite, pdo_sqlite

-

-      - name: Checkout app

-        uses: actions/checkout@v2

-        with:

-          path: apps/${{ env.APP_NAME }}

-

-      - name: App code check

-        run: php occ app:check-code ${{ env.APP_NAME }}

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 82874d4b..4fc25997 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -15,7 +15,7 @@ jobs:
       matrix:
         php-versions: ['7.4', '8.0']
 
-    name: php-cs
+    name: php-cs php${{ matrix.php-versions }}
 
     steps:
     - name: Checkout
@@ -36,14 +36,17 @@ jobs:
     strategy:
       matrix:
         node-versions: [14.x]
+        npm-versions: [7]
 
-    name: eslint node ${{ matrix.node-versions }}
+    name: eslint node${{ matrix.node-versions }} npm${{ matrix.npm-versions }}
     steps:
       - uses: actions/checkout@v2
       - name: Use node ${{ matrix.node-versions }}
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v2
         with:
           node-version: ${{ matrix.node-versions }}
+      - name: Set up npm ${{ matrix.npm-versions }}
+        run: npm i -g npm@"${{ matrix.npm-versions }}"
       - name: Install dependencies
         run: npm ci
       - name: Run Lint
@@ -55,18 +58,19 @@ jobs:
     strategy:
       matrix:
         node-versions: [14.x]
+        npm-versions: [7]
 
-    name: stylelint node ${{ matrix.node-versions }}
+    name: stylelint node${{ matrix.node-versions }} npm${{ matrix.npm-versions }}
     steps:
       - uses: actions/checkout@v2
 
       - name: Set up node ${{ matrix.node-versions }}
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v2
         with:
           node-version: ${{ matrix.node-versions }}
-
+      - name: Set up npm ${{ matrix.npm-version }}
+        run: npm i -g npm@"${{ matrix.npm-version }}"
       - name: Install dependencies
         run: npm ci
-
       - name: Run stylelint
         run: npm run stylelint
diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml
index 2342e41d..43f3e65a 100644
--- a/.github/workflows/nodejs.yml
+++ b/.github/workflows/nodejs.yml
@@ -9,17 +9,18 @@ jobs:
 

     strategy:

       matrix:

-        node-version: [14.x, 16.x]

-        npm-version: [7]

+        node-versions: [14.x, 16.x]

+        npm-versions: [7]

 

+    name: build node${{ matrix.node-versions }} npm${{ matrix.npm-versions }}

     steps:

     - uses: actions/checkout@v2

-    - name: Use Node.js ${{ matrix.node-version }}

+    - name: Use Node.js ${{ matrix.node-versions }}

       uses: actions/setup-node@v2

       with:

-        node-version: ${{ matrix.node-version }}

-    - name: Set up npm ${{ matrix.npm-version }}

-      run: npm i -g npm@"${{ matrix.npm-version }}"

+        node-version: ${{ matrix.node-versions }}

+    - name: Set up npm ${{ matrix.npm-versions }}

+      run: npm i -g npm@"${{ matrix.npm-versions }}"

     - name: install dependencies

       run: npm ci

     - name: build

diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
index faa7ea2e..396c29f5 100644
--- a/.github/workflows/phpunit.yml
+++ b/.github/workflows/phpunit.yml
@@ -22,7 +22,7 @@ jobs:
         databases: ['sqlite']
         server-versions: ['master', 'stable21']
 
-    name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }}
+    name: PHPUnit php${{ matrix.php-versions }} ${{ matrix.databases }} ${{ matrix.server-versions }}
 
     steps:
       - name: Checkout server
@@ -79,11 +79,11 @@ jobs:
       # do not stop on another job's failure
       fail-fast: false
       matrix:
-        php-versions: ['7.4', '8.0']
+        php-versions: ['8.0']
         databases: ['mysql']
-        server-versions: ['master', 'stable21']
+        server-versions: ['master', 'stable22']
 
-    name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }}
+    name: PHPUnit php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }}
 
     services:
       mysql:
@@ -149,11 +149,11 @@ jobs:
       # do not stop on another job's failure
       fail-fast: false
       matrix:
-        php-versions: ['7.4', '8.0']
+        php-versions: ['8.0']
         databases: ['pgsql']
-        server-versions: ['master', 'stable21']
+        server-versions: ['master', 'stable23']
 
-    name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }}
+    name: PHPUnit php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }}
 
     services:
       postgres:
diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
index bebcc146..ff3b78e8 100644
--- a/.github/workflows/static-analysis.yml
+++ b/.github/workflows/static-analysis.yml
@@ -14,8 +14,8 @@ jobs:
           matrix:

               ocp-version: [ 'dev-master', 'dev-stable21' ]

               php-versions: ['7.4', '8.0']

-              

-      name: Nextcloud ${{ matrix.ocp-version }}

+

+      name: psalm php${{ matrix.php-versions}} ${{ matrix.ocp-version }}

       steps:

           - name: Checkout

             uses: actions/checkout@master