From 34e6abb98b3ff275c46f33b30578311ae813048b Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 28 Mar 2024 13:44:24 +0100 Subject: [PATCH] fix(CI): Cover stable29 and drop EOL stable26 Signed-off-by: Joas Schilling --- workflow-templates/npm-audit-fix.yml | 2 +- workflow-templates/openapi.yml | 6 +++++- workflow-templates/update-nextcloud-ocp-matrix.yml | 2 +- workflow-templates/update-nextcloud-ocp.yml | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/workflow-templates/npm-audit-fix.yml b/workflow-templates/npm-audit-fix.yml index 4f51e2b2..0fa447f3 100644 --- a/workflow-templates/npm-audit-fix.yml +++ b/workflow-templates/npm-audit-fix.yml @@ -18,7 +18,7 @@ jobs: strategy: fail-fast: false matrix: - branches: ['main', 'master', 'stable28', 'stable27', 'stable26'] + branches: ['main', 'master', 'stable29', 'stable28', 'stable27'] name: npm-audit-fix-${{ matrix.branches }} diff --git a/workflow-templates/openapi.yml b/workflow-templates/openapi.yml index 8de82613..0db9f78c 100644 --- a/workflow-templates/openapi.yml +++ b/workflow-templates/openapi.yml @@ -19,10 +19,14 @@ jobs: - name: Checkout uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + - name: Get php version + id: versions + uses: icewind1991/nextcloud-version-matrix@58becf3b4bb6dc6cef677b15e2fd8e7d48c0908f # v1.3.1 + - name: Set up php uses: shivammathur/setup-php@a4e22b60bbb9c1021113f2860347b0759f66fe5d # v2 with: - php-version: '8.2' + php-version: ${{ steps.versions.outputs.php-available }} extensions: xml coverage: none ini-file: development diff --git a/workflow-templates/update-nextcloud-ocp-matrix.yml b/workflow-templates/update-nextcloud-ocp-matrix.yml index 8cfc0710..ce21c3eb 100644 --- a/workflow-templates/update-nextcloud-ocp-matrix.yml +++ b/workflow-templates/update-nextcloud-ocp-matrix.yml @@ -18,7 +18,7 @@ jobs: fail-fast: false matrix: branches: ['master'] - target: ['stable26'] + target: ['stable27'] name: update-nextcloud-ocp-${{ matrix.branches }} diff --git a/workflow-templates/update-nextcloud-ocp.yml b/workflow-templates/update-nextcloud-ocp.yml index 2d65b440..7ba334c7 100644 --- a/workflow-templates/update-nextcloud-ocp.yml +++ b/workflow-templates/update-nextcloud-ocp.yml @@ -17,7 +17,7 @@ jobs: strategy: fail-fast: false matrix: - branches: ['main', 'master', 'stable28', 'stable27', 'stable26'] + branches: ['main', 'master', 'stable29', 'stable28', 'stable27'] name: update-nextcloud-ocp-${{ matrix.branches }}