use better matrix for psalm

Signed-off-by: Robin Appelman <[email protected]>
nextcloud · Nov 3, 2023 · 3e4383f · 3e4383f
1 parent 1c3835e
commit 3e4383f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 9 deletions.
diff --git a/workflow-templates/lint-php-cs.yml b/workflow-templates/lint-php-cs.yml
@@ -26,7 +26,7 @@ jobs:
 
       - name: Get php version
         id: versions
-        uses: icewind1991/nextcloud-version-matrix@c2bf575a3516752db5ce2915499d3f694885e2c7 # main
+        uses: icewind1991/nextcloud-version-matrix@334a77e02e5684ba9da35933db0d7110356bf3ba # v1.1.0
 
       - name: Set up php${{ steps.versions.outputs.php-max }}
         uses: shivammathur/setup-php@81cd5ae0920b34eef300e1775313071038a53429 # v2

diff --git a/workflow-templates/lint-php.yml b/workflow-templates/lint-php.yml
@@ -24,7 +24,7 @@ jobs:
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       - name: Get version matrix
         id: versions
-        uses: icewind1991/nextcloud-version-matrix@111919cfc7b388b7c02cac3c5d53627137adb89f # main
+        uses: icewind1991/nextcloud-version-matrix@111919cfc7b388b7c02cac3c5d53627137adb89f # v1.0.0
 
   php-lint:
     runs-on: ubuntu-latest

diff --git a/workflow-templates/psalm-matrix.yml b/workflow-templates/psalm-matrix.yml
@@ -15,24 +15,21 @@ jobs:
   matrix:
     runs-on: ubuntu-latest
     outputs:
-      ocp-branches: ${{ steps.versions.outputs.ocp-branches }}
-      php-max: ${{ steps.versions.outputs.php-max-list }}
+      ocp-matrix: ${{ steps.versions.outputs.ocp-matrix }}
     steps:
       - name: Checkout app
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       - name: Get version matrix
         id: versions
-        uses: icewind1991/nextcloud-version-matrix@c2bf575a3516752db5ce2915499d3f694885e2c7 # main
+        uses: icewind1991/nextcloud-version-matrix@334a77e02e5684ba9da35933db0d7110356bf3ba # v1.1.0
 
   static-analysis:
     runs-on: ubuntu-latest
     needs: matrix
     strategy:
       # do not stop on another job's failure
       fail-fast: false
-      matrix:
-        ocp-version: ${{fromJson(needs.matrix.outputs.ocp-branches)}}
-        php-versions: ${{ fromJson(needs.matrix.outputs.php-max) }}
+      matrix: ${{ fromJson(needs.matrix.outputs.ocp-matrix) }}
 
     name: Nextcloud ${{ matrix.ocp-version }}
     steps:

diff --git a/workflow-templates/psalm.yml b/workflow-templates/psalm.yml
@@ -22,7 +22,7 @@ jobs:
 
       - name: Get php version
         id: versions
-        uses: icewind1991/nextcloud-version-matrix@c2bf575a3516752db5ce2915499d3f694885e2c7 # main
+        uses: icewind1991/nextcloud-version-matrix@334a77e02e5684ba9da35933db0d7110356bf3ba # v1.1.0
 
       - name: Set up php${{ steps.versions.outputs.php-max }}
         uses: shivammathur/setup-php@81cd5ae0920b34eef300e1775313071038a53429 # v2