Merge pull request #360 from nursoda/fix/static-analysis-NC-versions

Update dependencies and versions in GitHub workflow checks. Fix all errors (and warnings) the workflow checks brought up.
nursoda · Jan 3, 2023 · 03736a9 · 03736a9
2 parents 6707ebf + f070464
commit 03736a9
Show file tree

Hide file tree

Showing 13 changed files with 1,137 additions and 6,299 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -12,7 +12,10 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php: [ '7.4', '8.0', '8.1' ]
+        php:
+          - '7.4'
+          - '8.0'
+          - '8.1'
     name: php${{ matrix.php }}
     steps:
       - uses: actions/checkout@v2
@@ -28,7 +31,10 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node: [ '16.x', '17.x', '18.x' ]
+        node:
+          - '16.x'
+          - '18.x'
+          - '19.x'
     name: node${{ matrix.node }}
     steps:
       - uses: actions/checkout@v2

diff --git a/.github/workflows/node.yml b/.github/workflows/node.yml
@@ -13,7 +13,10 @@ jobs:
 
     strategy:
       matrix:
-        node-versions: ['14.x', '16.x', '17.x']
+        node-versions:
+          - '16.x'
+          - '18.x'
+          - '19.x'
 
     name: node${{ matrix.node-versions }}
     steps:

diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
@@ -1,18 +1,28 @@
 name: Static analysis
 
-on: [pull_request]
+on:
+  - pull_request
 
 jobs:
   static-psalm-analysis:
     runs-on: ubuntu-latest
     strategy:
       matrix: # https://docs.github.com/en/actions/using-jobs/using-a-build-matrix-for-your-jobs
-        nextcloud: [ 'v22.2.10', 'v23.0.9', 'v24.0.5', 'dev-master' ]
-        php: [ '7.4', '8.0' ]
+        ocp:
+          - 'dev-stable22'
+          - 'dev-stable23'
+          - 'dev-stable24'
+          - 'dev-stable25'
+          - 'dev-master'
+        php:
+          - '7.4'
+          - '8.0'
         include:
-          - nextcloud: 'dev-master' 
+          - ocp: 'dev-stable25' 
             php: '8.1'
-    name: Nextcloud ${{ matrix.nextcloud }} on PHP ${{ matrix.php }}
+          - ocp: 'dev-master' 
+            php: '8.1'
+    name: Nextcloud ${{ matrix.ocp }} on PHP ${{ matrix.php }}
     steps:
       - name: Checkout
         uses: actions/checkout@master
@@ -25,6 +35,6 @@ jobs:
       - name: Remove PHP lockfile
         run: rm composer.lock
       - name: Install dependencies
-        run: composer require --dev christophwurst/nextcloud:${{ matrix.nextcloud }}
+        run: composer require --dev nextcloud/ocp:${{ matrix.ocp }}
       - name: Run coding standards check
         run: composer run -- psalm --php-version=${{ matrix.php }}