diff options
author | Joas Schilling <213943+nickvergessen@users.noreply.github.com> | 2022-09-22 23:13:20 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-09-22 23:13:20 +0300 |
commit | 2438d73175c54701a3b507f2c499192255061616 (patch) | |
tree | 1cded7787617c66ec81186e4525b04f48bcfebf6 | |
parent | 696af19af56a2977ddc5fabc6ec020ee27b89f29 (diff) | |
parent | ce3085ffb948518ef77ba4be6ba0fec312e6766a (diff) |
Merge pull request #928 from nextcloud/update-stable25-target-versions
Adjust testing matrix for Nextcloud 25 on stable25
-rw-r--r-- | .github/workflows/phpunit-mysql.yml | 2 | ||||
-rw-r--r-- | .github/workflows/phpunit-oci.yml | 2 | ||||
-rw-r--r-- | .github/workflows/phpunit-pgsql.yml | 2 | ||||
-rw-r--r-- | .github/workflows/phpunit-sqlite.yml | 2 | ||||
-rw-r--r-- | .github/workflows/static-analysis.yml | 49 | ||||
-rw-r--r-- | .github/workflows/update-christophwurst-nextcloud.yml | 2 |
6 files changed, 33 insertions, 26 deletions
diff --git a/.github/workflows/phpunit-mysql.yml b/.github/workflows/phpunit-mysql.yml index 650e5def..90043905 100644 --- a/.github/workflows/phpunit-mysql.yml +++ b/.github/workflows/phpunit-mysql.yml @@ -19,7 +19,7 @@ jobs: strategy: matrix: php-versions: ['7.4', '8.0', '8.1'] - server-versions: ['master'] + server-versions: ['stable25'] services: mysql: diff --git a/.github/workflows/phpunit-oci.yml b/.github/workflows/phpunit-oci.yml index 87297e16..0bb18ad9 100644 --- a/.github/workflows/phpunit-oci.yml +++ b/.github/workflows/phpunit-oci.yml @@ -19,7 +19,7 @@ jobs: strategy: matrix: php-versions: ['8.0'] - server-versions: ['master'] + server-versions: ['stable25'] services: oracle: diff --git a/.github/workflows/phpunit-pgsql.yml b/.github/workflows/phpunit-pgsql.yml index 5d6eca96..1f468011 100644 --- a/.github/workflows/phpunit-pgsql.yml +++ b/.github/workflows/phpunit-pgsql.yml @@ -19,7 +19,7 @@ jobs: strategy: matrix: php-versions: ['8.0'] - server-versions: ['master'] + server-versions: ['stable25'] services: postgres: diff --git a/.github/workflows/phpunit-sqlite.yml b/.github/workflows/phpunit-sqlite.yml index 649d6e2d..5c91516f 100644 --- a/.github/workflows/phpunit-sqlite.yml +++ b/.github/workflows/phpunit-sqlite.yml @@ -19,7 +19,7 @@ jobs: strategy: matrix: php-versions: ['8.0'] - server-versions: ['master'] + server-versions: ['stable25'] steps: - name: Set app env diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index d6369a08..7dc1b16d 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-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 diff --git a/.github/workflows/update-christophwurst-nextcloud.yml b/.github/workflows/update-christophwurst-nextcloud.yml index e2e5f526..50c81c6f 100644 --- a/.github/workflows/update-christophwurst-nextcloud.yml +++ b/.github/workflows/update-christophwurst-nextcloud.yml @@ -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 }} |