Skip to content

Commit

Permalink
Merge pull request #243 from nextcloud/ci/noid/improve-handling
Browse files Browse the repository at this point in the history
Update CI workflows
  • Loading branch information
nickvergessen authored Oct 30, 2023
2 parents 62aa1a1 + 353c785 commit 3e4181b
Show file tree
Hide file tree
Showing 17 changed files with 36 additions and 99 deletions.
2 changes: 1 addition & 1 deletion workflow-templates/appstore-build-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
types: [published]

env:
PHP_VERSION: 8.1
PHP_VERSION: 8.2

jobs:
build_and_publish:
Expand Down
12 changes: 5 additions & 7 deletions workflow-templates/cypress.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
name: Cypress

on:
pull_request:
push:
branches:
- main
- master
- stable*
on: pull_request

concurrency:
group: cypress-${{ github.head_ref || github.run_id }}
cancel-in-progress: true

env:
# Adjust APP_NAME if your repository name is different
Expand Down
3 changes: 1 addition & 2 deletions workflow-templates/lint-eslint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@

name: Lint eslint

on:
pull_request:
on: pull_request

permissions:
contents: read
Expand Down
8 changes: 1 addition & 7 deletions workflow-templates/lint-info-xml.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,7 @@

name: Lint info.xml

on:
pull_request:
push:
branches:
- main
- master
- stable*
on: pull_request

permissions:
contents: read
Expand Down
4 changes: 2 additions & 2 deletions workflow-templates/lint-php-cs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ jobs:
- name: Checkout
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

- name: Set up php
- name: Set up php8.2
uses: shivammathur/setup-php@7fdd3ece872ec7ec4c098ae5ab7637d5e0a96067 # v2
with:
php-version: 8.1
php-version: 8.2
coverage: none
ini-file: development
env:
Expand Down
10 changes: 2 additions & 8 deletions workflow-templates/lint-php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,7 @@

name: Lint php

on:
pull_request:
push:
branches:
- main
- master
- stable*
on: pull_request

permissions:
contents: read
Expand All @@ -25,7 +19,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
php-versions: [ "8.0", "8.1", "8.2" ]
php-versions: [ '8.0', '8.1', '8.2', '8.3' ]

name: php-lint

Expand Down
8 changes: 1 addition & 7 deletions workflow-templates/node.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,7 @@

name: Node

on:
pull_request:
push:
branches:
- main
- master
- stable*
on: pull_request

permissions:
contents: read
Expand Down
2 changes: 1 addition & 1 deletion workflow-templates/npm-audit-fix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
strategy:
fail-fast: false
matrix:
branches: ["main", "master", "stable27", "stable26", "stable25"]
branches: ['main', 'master', 'stable28', 'stable27', 'stable26']

name: npm-audit-fix-${{ matrix.branches }}

Expand Down
10 changes: 2 additions & 8 deletions workflow-templates/phpunit-mariadb.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,7 @@

name: PHPUnit mariadb

on:
pull_request:
push:
branches:
- main
- master
- stable*
on: pull_request

permissions:
contents: read
Expand Down Expand Up @@ -53,7 +47,7 @@ jobs:

strategy:
matrix:
php-versions: ['8.0']
php-versions: ['8.2']
mariadb-versions: ['10.6', '10.11']
server-versions: ['master']

Expand Down
8 changes: 1 addition & 7 deletions workflow-templates/phpunit-mysql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,7 @@

name: PHPUnit MySQL

on:
pull_request:
push:
branches:
- main
- master
- stable*
on: pull_request

permissions:
contents: read
Expand Down
10 changes: 2 additions & 8 deletions workflow-templates/phpunit-oci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,7 @@

name: PHPUnit OCI

on:
pull_request:
push:
branches:
- main
- master
- stable*
on: pull_request

permissions:
contents: read
Expand Down Expand Up @@ -53,7 +47,7 @@ jobs:

strategy:
matrix:
php-versions: ['8.0']
php-versions: ['8.2']
server-versions: ['master']

services:
Expand Down
10 changes: 2 additions & 8 deletions workflow-templates/phpunit-pgsql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,7 @@

name: PHPUnit pgsql

on:
pull_request:
push:
branches:
- main
- master
- stable*
on: pull_request

permissions:
contents: read
Expand Down Expand Up @@ -53,7 +47,7 @@ jobs:

strategy:
matrix:
php-versions: ['8.0']
php-versions: ['8.2']
server-versions: ['master']

services:
Expand Down
10 changes: 2 additions & 8 deletions workflow-templates/phpunit-sqlite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,7 @@

name: PHPUnit sqlite

on:
pull_request:
push:
branches:
- main
- master
- stable*
on: pull_request

permissions:
contents: read
Expand Down Expand Up @@ -53,7 +47,7 @@ jobs:

strategy:
matrix:
php-versions: ['8.0']
php-versions: ['8.2']
server-versions: ['master']

steps:
Expand Down
14 changes: 4 additions & 10 deletions workflow-templates/psalm-matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,7 @@

name: Static analysis

on:
pull_request:
push:
branches:
- master
- main
- stable*
on: pull_request

concurrency:
group: psalm-${{ github.head_ref || github.run_id }}
Expand All @@ -24,17 +18,17 @@ jobs:
# do not stop on another job's failure
fail-fast: false
matrix:
ocp-version: [ 'dev-master', 'dev-stable27', 'dev-stable26', 'dev-stable25']
ocp-version: [ 'dev-master', 'dev-stable28', 'dev-stable27', 'dev-stable26' ]

name: Nextcloud ${{ matrix.ocp-version }}
steps:
- name: Checkout
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

- name: Set up php
- name: Set up php8.2
uses: shivammathur/setup-php@7fdd3ece872ec7ec4c098ae5ab7637d5e0a96067 # v2
with:
php-version: 8.0
php-version: 8.2
coverage: none
ini-file: development
env:
Expand Down
12 changes: 3 additions & 9 deletions workflow-templates/psalm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,7 @@

name: Static analysis

on:
pull_request:
push:
branches:
- master
- main
- stable*
on: pull_request

concurrency:
group: psalm-${{ github.head_ref || github.run_id }}
Expand All @@ -26,10 +20,10 @@ jobs:
- name: Checkout
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

- name: Set up php
- name: Set up php8.2
uses: shivammathur/setup-php@7fdd3ece872ec7ec4c098ae5ab7637d5e0a96067 # v2
with:
php-version: 8.1
php-version: 8.2
coverage: none
ini-file: development
env:
Expand Down
6 changes: 3 additions & 3 deletions workflow-templates/update-nextcloud-ocp-matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
fail-fast: false
matrix:
branches: ['master']
target: ['stable25']
target: ['stable26']

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

Expand All @@ -28,10 +28,10 @@ jobs:
ref: ${{ matrix.branches }}
submodules: true

- name: Set up php8.0
- name: Set up php8.2
uses: shivammathur/setup-php@7fdd3ece872ec7ec4c098ae5ab7637d5e0a96067 # v2
with:
php-version: 8.0
php-version: 8.2
# https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite
coverage: none
Expand Down
6 changes: 3 additions & 3 deletions workflow-templates/update-nextcloud-ocp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
strategy:
fail-fast: false
matrix:
branches: ["main", "master", "stable27", "stable26", "stable25"]
branches: ['main', 'master', 'stable28', 'stable27', 'stable26']

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

Expand All @@ -29,11 +29,11 @@ jobs:
submodules: true
continue-on-error: true

- name: Set up php8.1
- name: Set up php8.2
if: steps.checkout.outcome == 'success'
uses: shivammathur/setup-php@7fdd3ece872ec7ec4c098ae5ab7637d5e0a96067 # v2
with:
php-version: 8.1
php-version: 8.2
# https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite
coverage: none
Expand Down

0 comments on commit 3e4181b

Please sign in to comment.