Skip to content

Commit

Permalink
Merge pull request #928 from nextcloud/update-stable25-target-versions
Browse files Browse the repository at this point in the history
Adjust testing matrix for Nextcloud 25 on stable25
  • Loading branch information
nickvergessen authored Sep 22, 2022
2 parents 696af19 + ce3085f commit 2438d73
Show file tree
Hide file tree
Showing 6 changed files with 33 additions and 26 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/phpunit-mysql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
strategy:
matrix:
php-versions: ['7.4', '8.0', '8.1']
server-versions: ['master']
server-versions: ['stable25']

services:
mysql:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/phpunit-oci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
strategy:
matrix:
php-versions: ['8.0']
server-versions: ['master']
server-versions: ['stable25']

services:
oracle:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/phpunit-pgsql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
strategy:
matrix:
php-versions: ['8.0']
server-versions: ['master']
server-versions: ['stable25']

services:
postgres:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/phpunit-sqlite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
strategy:
matrix:
php-versions: ['8.0']
server-versions: ['master']
server-versions: ['stable25']

steps:
- name: Set app env
Expand Down
49 changes: 28 additions & 21 deletions .github/workflows/static-analysis.yml
Original file line number Diff line number Diff line change
@@ -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-master' ]
name: Nextcloud ${{ matrix.ocp-version }}
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Set up php
uses: shivammathur/setup-php@v2
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
2 changes: 1 addition & 1 deletion .github/workflows/update-christophwurst-nextcloud.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
strategy:
fail-fast: false
matrix:
branches: ["master", "stable24", "stable23", "stable22"]
branches: ["master", "stable25", "stable24", "stable23"]

name: update-christophwurst-nextcloud-${{ matrix.branches }}

Expand Down

0 comments on commit 2438d73

Please sign in to comment.