From 2eaf996a6496765cc3ee22c051646895c260e620 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Thu, 22 Sep 2022 12:10:29 +0200
Subject: Adjust testing matrix for Nextcloud 25 on stable25

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 .github/workflows/integration.yml     | 8 ++++----
 .github/workflows/phpunit.yml         | 8 ++++----
 .github/workflows/static-analysis.yml | 2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index dcb0192..13cacfe 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -27,7 +27,7 @@ jobs:
       matrix:
         php-versions: ['7.4']
         databases: ['sqlite']
-        server-versions: ['master']
+        server-versions: ['stable25']
 
     name: integration-php${{ matrix.php-versions }}-${{ matrix.databases }}
 
@@ -135,7 +135,7 @@ jobs:
       matrix:
         php-versions: ['7.4', '8.0', "8.1"]
         databases: ['mysql']
-        server-versions: ['master']
+        server-versions: ['stable25']
 
     name: integration-php${{ matrix.php-versions }}-${{ matrix.databases }}
 
@@ -201,7 +201,7 @@ jobs:
       matrix:
         php-versions: ['7.4']
         databases: ['pgsql']
-        server-versions: ['master']
+        server-versions: ['stable25']
 
     name: integration-php${{ matrix.php-versions }}-${{ matrix.databases }}
 
@@ -269,7 +269,7 @@ jobs:
       matrix:
         php-versions: ['7.4']
         databases: ['oci']
-        server-versions: ['master']
+        server-versions: ['stable25']
 
     name: integration-php${{ matrix.php-versions }}-${{ matrix.databases }}
 
diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
index 81bb240..8470373 100644
--- a/.github/workflows/phpunit.yml
+++ b/.github/workflows/phpunit.yml
@@ -27,7 +27,7 @@ jobs:
       matrix:
         php-versions: ['7.4']
         databases: ['sqlite']
-        server-versions: ['master']
+        server-versions: ['stable25']
 
     name: php${{ matrix.php-versions }}-${{ matrix.databases }}
 
@@ -83,7 +83,7 @@ jobs:
       matrix:
         php-versions: ['7.4', '8.0', "8.1"]
         databases: ['mysql']
-        server-versions: ['master']
+        server-versions: ['stable25']
 
     name: php${{ matrix.php-versions }}-${{ matrix.databases }}
 
@@ -148,7 +148,7 @@ jobs:
       matrix:
         php-versions: ['7.4']
         databases: ['pgsql']
-        server-versions: ['master']
+        server-versions: ['stable25']
 
     name: php${{ matrix.php-versions }}-${{ matrix.databases }}
 
@@ -215,7 +215,7 @@ jobs:
       matrix:
         php-versions: ['7.4']
         databases: ['oci']
-        server-versions: ['master']
+        server-versions: ['stable25']
 
     name: php${{ matrix.php-versions }}-${{ matrix.databases }}
 
diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
index 4f40268..6e4cc08 100644
--- a/.github/workflows/static-analysis.yml
+++ b/.github/workflows/static-analysis.yml
@@ -7,7 +7,7 @@ jobs:
       runs-on: ubuntu-latest
       strategy:
           matrix:
-              ocp-version: [ 'dev-master' ]
+              ocp-version: [ 'dev-stable25' ]
       name: Nextcloud ${{ matrix.ocp-version }}
       steps:
           - name: Checkout
-- 
cgit v1.2.3


From 1c7046fae29f58dd41ecd9a5253e6e9fce402e9d Mon Sep 17 00:00:00 2001
From: Carl Schwan <carl@carlschwan.eu>
Date: Thu, 22 Sep 2022 13:23:46 +0200
Subject: Update static analysis workflow

Signed-off-by: Carl Schwan <carl@carlschwan.eu>
---
 .github/workflows/static-analysis.yml | 49 ++++++++++++++++++++---------------
 1 file changed, 28 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
index 6e4cc08..7dc1b16 100644
--- a/.github/workflows/static-analysis.yml
+++ b/.github/workflows/static-analysis.yml
@@ -1,26 +1,33 @@
 name: Static analysis
 
-on: [pull_request]
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+      - stable*
 
 jobs:
   static-psalm-analysis:
-      runs-on: ubuntu-latest
-      strategy:
-          matrix:
-              ocp-version: [ 'dev-stable25' ]
-      name: Nextcloud ${{ matrix.ocp-version }}
-      steps:
-          - name: Checkout
-            uses: actions/checkout@master
-          - name: Set up php
-            uses: shivammathur/setup-php@master
-            with:
-                php-version: 7.4
-                tools: composer:v1
-                coverage: none
-          - name: Install dependencies
-            run: composer i
-          - name: Install dependencies
-            run: composer require --dev christophwurst/nextcloud:${{ matrix.ocp-version }}
-          - name: Run coding standards check
-            run: composer run psalm
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        ocp-version: [ 'dev-stable25' ]
+
+    name: Nextcloud ${{ matrix.ocp-version }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@master
+
+      - name: Set up php
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 7.4
+          coverage: none
+
+      - name: Install dependencies
+        run: composer install --dev
+
+      - name: Run coding standards check
+        run: composer run psalm
-- 
cgit v1.2.3