From 7d73ae3a5017b6d75e6e510796564cce29490bdb Mon Sep 17 00:00:00 2001 From: Jonas Date: Mon, 6 Nov 2023 15:22:54 +0100 Subject: [PATCH] chore(ci): Update Github workflows from templates Signed-off-by: Jonas --- .github/workflows/app-upgrade-mysql.yml | 51 ++++++++------ .github/workflows/app-upgrade-postgres.yml | 51 ++++++++------ .github/workflows/behat-sqlite-encryption.yml | 50 +++++++------ .github/workflows/behat-sqlite.yml | 52 ++++++++------ .github/workflows/cypress.yml | 70 +++++++++++-------- .../workflows/lint-eslint-when-unrelated.yml | 39 ----------- .github/workflows/lint-eslint.yml | 63 ++++++++++++----- .github/workflows/lint-info-xml.yml | 9 +-- .github/workflows/lint-php-cs.yml | 8 +-- .github/workflows/lint-php.yml | 10 +-- .github/workflows/lint-stylelint.yml | 4 +- .github/workflows/node.yml | 69 ++++++++++++------ .github/workflows/occ-cli-mysql.yml | 18 ----- .github/workflows/phpunit-sqlite.yml | 52 ++++++++------ .../phpunit-summary-when-unrelated.yml | 68 ------------------ .github/workflows/pr-feedback.yml | 2 +- .github/workflows/psalm.yml | 13 +--- .../workflows/update-nextcloud-ocp-matrix.yml | 4 +- 18 files changed, 293 insertions(+), 340 deletions(-) delete mode 100644 .github/workflows/lint-eslint-when-unrelated.yml delete mode 100644 .github/workflows/phpunit-summary-when-unrelated.yml diff --git a/.github/workflows/app-upgrade-mysql.yml b/.github/workflows/app-upgrade-mysql.yml index 699c60c53..c3e86f74e 100644 --- a/.github/workflows/app-upgrade-mysql.yml +++ b/.github/workflows/app-upgrade-mysql.yml @@ -1,26 +1,6 @@ name: app upgrade mysql -on: - pull_request: - paths: - #- '.github/workflows/**' - #- 'appinfo/**' - #- 'lib/**' - #- 'templates/**' - #- 'tests/**' - #- 'vendor/**' - #- 'vendor-bin/**' - #- '.php-cs-fixer.dist.php' - #- 'composer.json' - #- 'composer.lock' - - merge_group: - - push: - branches: - - main - - master - - stable* +on: pull_request permissions: contents: read @@ -30,9 +10,36 @@ concurrency: cancel-in-progress: true jobs: + changes: + runs-on: ubuntu-latest + + outputs: + src: ${{ steps.changes.outputs.src}} + + steps: + - uses: dorny/paths-filter@4512585405083f25c027a35db413c2b3b9006d50 # v2.11.1 + id: changes + continue-on-error: true + with: + filters: | + src: + - '.github/workflows/**' + - 'appinfo/**' + - 'lib/**' + - 'templates/**' + - 'tests/**' + - 'vendor/**' + - 'vendor-bin/**' + - '.php-cs-fixer.dist.php' + - 'composer.json' + - 'composer.lock' + app-upgrade-mysql: runs-on: ubuntu-latest + needs: changes + if: needs.changes.outputs.src != 'false' + strategy: matrix: php-versions: ['8.2'] @@ -152,4 +159,4 @@ jobs: steps: - name: Summary status - run: if ${{ needs.app-upgrade-mysql.result != 'success' }}; then exit 1; fi + run: if ${{ needs.changes.outputs.src != 'false' && needs.app-upgrade-mysql.result != 'success' }}; then exit 1; fi diff --git a/.github/workflows/app-upgrade-postgres.yml b/.github/workflows/app-upgrade-postgres.yml index f99e5792e..e611dbd45 100644 --- a/.github/workflows/app-upgrade-postgres.yml +++ b/.github/workflows/app-upgrade-postgres.yml @@ -1,26 +1,6 @@ name: app upgrade pgsql -on: - pull_request: - paths: - #- '.github/workflows/**' - #- 'appinfo/**' - #- 'lib/**' - #- 'templates/**' - #- 'tests/**' - #- 'vendor/**' - #- 'vendor-bin/**' - #- '.php-cs-fixer.dist.php' - #- 'composer.json' - #- 'composer.lock' - - merge_group: - - push: - branches: - - main - - master - - stable* +on: pull_request permissions: contents: read @@ -30,9 +10,36 @@ concurrency: cancel-in-progress: true jobs: + changes: + runs-on: ubuntu-latest + + outputs: + src: ${{ steps.changes.outputs.src}} + + steps: + - uses: dorny/paths-filter@4512585405083f25c027a35db413c2b3b9006d50 # v2.11.1 + id: changes + continue-on-error: true + with: + filters: | + src: + - '.github/workflows/**' + - 'appinfo/**' + - 'lib/**' + - 'templates/**' + - 'tests/**' + - 'vendor/**' + - 'vendor-bin/**' + - '.php-cs-fixer.dist.php' + - 'composer.json' + - 'composer.lock' + app-upgrade-pgsql: runs-on: ubuntu-latest + needs: changes + if: needs.changes.outputs.src != 'false' + strategy: matrix: php-versions: ['8.2'] @@ -148,4 +155,4 @@ jobs: steps: - name: Summary status - run: if ${{ needs.app-upgrade-pgsql.result != 'success' }}; then exit 1; fi + run: if ${{ needs.changes.outputs.src != 'false' && needs.app-upgrade-pgsql.result != 'success' }}; then exit 1; fi diff --git a/.github/workflows/behat-sqlite-encryption.yml b/.github/workflows/behat-sqlite-encryption.yml index 996a1f61b..8f78b741f 100644 --- a/.github/workflows/behat-sqlite-encryption.yml +++ b/.github/workflows/behat-sqlite-encryption.yml @@ -1,25 +1,6 @@ name: Behat -on: - pull_request: - paths: - #- '.github/workflows/**' - #- 'appinfo/**' - #- 'lib/**' - #- 'templates/**' - #- 'tests/**' - #- 'vendor/**' - #- 'vendor-bin/**' - #- '.php-cs-fixer.dist.php' - #- 'composer.json' - #- 'composer.lock' - - merge_group: - push: - branches: - - main - - master - - stable* +on: pull_request permissions: contents: read @@ -33,9 +14,36 @@ env: BEHAT_CONFIG: ./tests/Integration/config/behat.yml jobs: + changes: + runs-on: ubuntu-latest + + outputs: + src: ${{ steps.changes.outputs.src}} + + steps: + - uses: dorny/paths-filter@4512585405083f25c027a35db413c2b3b9006d50 # v2.11.1 + id: changes + continue-on-error: true + with: + filters: | + src: + - '.github/workflows/**' + - 'appinfo/**' + - 'lib/**' + - 'templates/**' + - 'tests/**' + - 'vendor/**' + - 'vendor-bin/**' + - '.php-cs-fixer.dist.php' + - 'composer.json' + - 'composer.lock' + behat-sqlite-encryption: runs-on: ubuntu-latest + needs: changes + if: needs.changes.outputs.src != 'false' + strategy: matrix: php-versions: ['8.2'] @@ -121,4 +129,4 @@ jobs: steps: - name: Summary status - run: if ${{ needs.behat-sqlite-encryption.result != 'success' }}; then exit 1; fi + run: if ${{ needs.changes.outputs.src != 'false' && needs.behat-sqlite-encryption.result != 'success' }}; then exit 1; fi diff --git a/.github/workflows/behat-sqlite.yml b/.github/workflows/behat-sqlite.yml index 936ca37b5..fbb628ebd 100644 --- a/.github/workflows/behat-sqlite.yml +++ b/.github/workflows/behat-sqlite.yml @@ -1,25 +1,6 @@ name: Behat -on: - pull_request: - paths: - #- '.github/workflows/**' - #- 'appinfo/**' - #- 'lib/**' - #- 'templates/**' - #- 'tests/**' - #- 'vendor/**' - #- 'vendor-bin/**' - #- '.php-cs-fixer.dist.php' - #- 'composer.json' - #- 'composer.lock' - - merge_group: - push: - branches: - - main - - master - - stable* +on: pull_request permissions: contents: read @@ -33,9 +14,36 @@ env: BEHAT_CONFIG: ./tests/Integration/config/behat.yml jobs: + changes: + runs-on: ubuntu-latest + + outputs: + src: ${{ steps.changes.outputs.src}} + + steps: + - uses: dorny/paths-filter@4512585405083f25c027a35db413c2b3b9006d50 # v2.11.1 + id: changes + continue-on-error: true + with: + filters: | + src: + - '.github/workflows/**' + - 'appinfo/**' + - 'lib/**' + - 'templates/**' + - 'tests/**' + - 'vendor/**' + - 'vendor-bin/**' + - '.php-cs-fixer.dist.php' + - 'composer.json' + - 'composer.lock' + behat-sqlite: runs-on: ubuntu-latest + needs: changes + if: needs.changes.outputs.src != 'false' + strategy: matrix: php-versions: ['8.2'] @@ -113,7 +121,7 @@ jobs: permissions: contents: none runs-on: ubuntu-latest - needs: behat-sqlite + needs: [changes, behat-sqlite] if: always() @@ -121,4 +129,4 @@ jobs: steps: - name: Summary status - run: if ${{ needs.behat-sqlite.result != 'success' }}; then exit 1; fi + run: if ${{ needs.changes.outputs.src != 'false' && needs.behat-sqlite.result != 'success' }}; then exit 1; fi diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml index 076f48dea..acc069ca6 100644 --- a/.github/workflows/cypress.yml +++ b/.github/workflows/cypress.yml @@ -1,37 +1,12 @@ name: Cypress -on: - pull_request: - paths: - - '.github/workflows/**' - - 'appinfo/**' - - 'cypress/**' - - 'l10n/**' - - 'lib/**' - - 'src/**' - - 'skeleton/**' - - 'templates/**' - - '.php-cs-fixer.dist.php' - - 'babel.config.js' - - 'composer.json' - - 'composer.lock' - - 'cypress.json' - - 'package.json' - - 'package-lock.json' - - merge_group: - - push: - branches: - - main - - master - - stable* +on: pull_request permissions: contents: read concurrency: - group: ${{ github.head_ref || github.run_id }} + group: cypress-${{ github.head_ref || github.run_id }} cancel-in-progress: true env: @@ -39,8 +14,43 @@ env: CYPRESS_baseUrl: http://localhost:8081/index.php jobs: + changes: + runs-on: ubuntu-latest + + outputs: + src: ${{ steps.changes.outputs.src}} + + steps: + - uses: dorny/paths-filter@4512585405083f25c027a35db413c2b3b9006d50 # v2.11.1 + id: changes + continue-on-error: true + with: + filters: | + src: + - '.github/workflows/**' + - 'appinfo/**' + - 'css/**' + - 'lib/**' + - 'skeleton/**' + - 'src/**' + - 'templates/**' + - 'babel.config.js' + - 'composer.json' + - 'composer.lock' + - 'cypress.config.js' + - 'package.json' + - 'package-lock.json' + - 'tsconfig.json' + - '**.js' + - '**.ts' + - '**.vue' + init: runs-on: ubuntu-22.04 + + needs: changes + if: needs.changes.outputs.src != 'false' + outputs: nodeVersion: ${{ steps.versions.outputs.nodeVersion }} npmVersion: ${{ steps.versions.outputs.npmVersion }} @@ -126,7 +136,9 @@ jobs: cypress: runs-on: ubuntu-22.04 - needs: init + + needs: [changes, init] + if: needs.changes.outputs.src != 'false' strategy: fail-fast: false @@ -257,4 +269,4 @@ jobs: steps: - name: Summary status - run: if ${{ needs.init.result != 'success' || ( needs.cypress.result != 'success' && needs.cypress.result != 'skipped' ) }}; then exit 1; fi + run: if ${{ needs.changes.outputs.src != 'false' && (needs.init.result != 'success' || ( needs.cypress.result != 'success' && needs.cypress.result != 'skipped' )) }}; then exit 1; fi diff --git a/.github/workflows/lint-eslint-when-unrelated.yml b/.github/workflows/lint-eslint-when-unrelated.yml deleted file mode 100644 index 7a2e9f058..000000000 --- a/.github/workflows/lint-eslint-when-unrelated.yml +++ /dev/null @@ -1,39 +0,0 @@ -# This workflow is provided via the organization template repository -# -# https://github.com/nextcloud/.github -# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization -# -# Use lint-eslint together with lint-eslint-when-unrelated to make eslint a required check for GitHub actions -# https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/troubleshooting-required-status-checks#handling-skipped-but-required-checks - -name: Lint eslint - -on: - pull_request: - paths-ignore: - - '.github/workflows/**' - - 'src/**' - - 'appinfo/info.xml' - - 'package.json' - - 'package-lock.json' - - 'tsconfig.json' - - '.eslintrc.*' - - '.eslintignore' - - '**.js' - - '**.ts' - - '**.vue' - -permissions: - contents: read - -jobs: - lint: - permissions: - contents: none - - runs-on: ubuntu-latest - - name: eslint - - steps: - - run: 'echo "No eslint required"' diff --git a/.github/workflows/lint-eslint.yml b/.github/workflows/lint-eslint.yml index 43446285e..99b624d1a 100644 --- a/.github/workflows/lint-eslint.yml +++ b/.github/workflows/lint-eslint.yml @@ -8,22 +8,7 @@ name: Lint eslint -on: - pull_request: - paths: - - '.github/workflows/**' - - 'src/**' - - 'appinfo/info.xml' - - 'package.json' - - 'package-lock.json' - - 'tsconfig.json' - - '.eslintrc.*' - - '.eslintignore' - - '**.js' - - '**.ts' - - '**.vue' - - merge_group: +on: pull_request permissions: contents: read @@ -33,10 +18,38 @@ concurrency: cancel-in-progress: true jobs: + changes: + runs-on: ubuntu-latest + + outputs: + src: ${{ steps.changes.outputs.src}} + + steps: + - uses: dorny/paths-filter@4512585405083f25c027a35db413c2b3b9006d50 # v2.11.1 + id: changes + continue-on-error: true + with: + filters: | + src: + - '.github/workflows/**' + - 'src/**' + - 'appinfo/info.xml' + - 'package.json' + - 'package-lock.json' + - 'tsconfig.json' + - '.eslintrc.*' + - '.eslintignore' + - '**.js' + - '**.ts' + - '**.vue' + lint: runs-on: ubuntu-latest - name: eslint + needs: changes + if: needs.changes.outputs.src != 'false' + + name: NPM lint steps: - name: Checkout @@ -60,7 +73,23 @@ jobs: - name: Install dependencies env: CYPRESS_INSTALL_BINARY: 0 + PUPPETEER_SKIP_DOWNLOAD: true run: npm ci - name: Lint run: npm run lint + + summary: + permissions: + contents: none + runs-on: ubuntu-latest + needs: [changes, lint] + + if: always() + + # This is the summary, we just avoid to rename it so that branch protection rules still match + name: eslint + + steps: + - name: Summary status + run: if ${{ needs.changes.outputs.src != 'false' && needs.lint.result != 'success' }}; then exit 1; fi diff --git a/.github/workflows/lint-info-xml.yml b/.github/workflows/lint-info-xml.yml index d01c44051..bf6f17872 100644 --- a/.github/workflows/lint-info-xml.yml +++ b/.github/workflows/lint-info-xml.yml @@ -5,14 +5,7 @@ name: Lint info.xml -on: - pull_request: - merge_group: - push: - branches: - - main - - master - - stable* +on: pull_request permissions: contents: read diff --git a/.github/workflows/lint-php-cs.yml b/.github/workflows/lint-php-cs.yml index edfc1eb65..c23fc7c40 100644 --- a/.github/workflows/lint-php-cs.yml +++ b/.github/workflows/lint-php-cs.yml @@ -5,9 +5,7 @@ name: Lint php-cs -on: - pull_request: - merge_group: +on: pull_request permissions: contents: read @@ -26,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@81cd5ae0920b34eef300e1775313071038a53429 # v2 with: - php-version: 8.1 + php-version: 8.2 coverage: none ini-file: development env: diff --git a/.github/workflows/lint-php.yml b/.github/workflows/lint-php.yml index 8d1271795..0367bd76b 100644 --- a/.github/workflows/lint-php.yml +++ b/.github/workflows/lint-php.yml @@ -5,13 +5,7 @@ name: Lint php -on: - pull_request: - push: - branches: - - main - - master - - stable* +on: pull_request permissions: contents: read @@ -25,7 +19,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - php-versions: [ "7.4", "8.0", "8.1", "8.2", "8.3" ] + php-versions: [ '7.4', '8.0', '8.1', '8.2', '8.3' ] name: php-lint diff --git a/.github/workflows/lint-stylelint.yml b/.github/workflows/lint-stylelint.yml index c7914ce44..684bb6198 100644 --- a/.github/workflows/lint-stylelint.yml +++ b/.github/workflows/lint-stylelint.yml @@ -5,9 +5,7 @@ name: Lint stylelint -on: - pull_request: - merge_group: +on: pull_request permissions: contents: read diff --git a/.github/workflows/node.yml b/.github/workflows/node.yml index 19878ceb3..e93d6392c 100644 --- a/.github/workflows/node.yml +++ b/.github/workflows/node.yml @@ -5,24 +5,7 @@ name: Node -on: - pull_request: - paths: - - '.github/workflows/**' - - 'src/**' - - 'appinfo/info.xml' - - 'package.json' - - 'package-lock.json' - - 'tsconfig.json' - - '**.js' - - '**.ts' - - '**.vue' - merge_group: - push: - branches: - - main - - master - - stable* +on: pull_request permissions: contents: read @@ -32,10 +15,36 @@ concurrency: cancel-in-progress: true jobs: - build: + changes: runs-on: ubuntu-latest - name: node + outputs: + src: ${{ steps.changes.outputs.src}} + + steps: + - uses: dorny/paths-filter@4512585405083f25c027a35db413c2b3b9006d50 # v2.11.1 + id: changes + continue-on-error: true + with: + filters: | + src: + - '.github/workflows/**' + - 'src/**' + - 'appinfo/info.xml' + - 'package.json' + - 'package-lock.json' + - 'tsconfig.json' + - '**.js' + - '**.ts' + - '**.vue' + + test: + runs-on: ubuntu-latest + + needs: changes + if: needs.changes.outputs.src != 'false' + + name: NPM test steps: - name: Checkout uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 @@ -58,10 +67,24 @@ jobs: - name: Install dependencies & build env: CYPRESS_INSTALL_BINARY: 0 + PUPPETEER_SKIP_DOWNLOAD: true run: | npm ci npm run build --if-present - - name: Run npm test - run: | - npm test + - name: Test + run: npm test + + summary: + permissions: + contents: none + runs-on: ubuntu-latest + needs: [changes, test] + + if: always() + + name: test-summary + + steps: + - name: Summary status + run: if ${{ needs.changes.outputs.src != 'false' && needs.test.result != 'success' }}; then exit 1; fi diff --git a/.github/workflows/occ-cli-mysql.yml b/.github/workflows/occ-cli-mysql.yml index f4096886f..d780d9320 100644 --- a/.github/workflows/occ-cli-mysql.yml +++ b/.github/workflows/occ-cli-mysql.yml @@ -2,24 +2,6 @@ name: occ cli on: pull_request: - paths: - #- '.github/workflows/**' - #- 'appinfo/**' - #- 'lib/**' - #- 'templates/**' - #- 'tests/**' - #- 'vendor/**' - #- 'vendor-bin/**' - #- '.php-cs-fixer.dist.php' - #- 'composer.json' - #- 'composer.lock' - - merge_group: - push: - branches: - - main - - master - - stable* permissions: contents: read diff --git a/.github/workflows/phpunit-sqlite.yml b/.github/workflows/phpunit-sqlite.yml index 2f538e1de..67abcf647 100644 --- a/.github/workflows/phpunit-sqlite.yml +++ b/.github/workflows/phpunit-sqlite.yml @@ -5,26 +5,7 @@ name: PHPUnit sqlite -on: - pull_request: - paths: - - '.github/workflows/**' - - 'appinfo/**' - - 'lib/**' - - 'templates/**' - - 'tests/**' - - 'vendor/**' - - 'vendor-bin/**' - - '.php-cs-fixer.dist.php' - - 'composer.json' - - 'composer.lock' - - merge_group: - push: - branches: - - main - - master - - stable* +on: pull_request permissions: contents: read @@ -34,9 +15,36 @@ concurrency: cancel-in-progress: true jobs: + changes: + runs-on: ubuntu-latest + + outputs: + src: ${{ steps.changes.outputs.src}} + + steps: + - uses: dorny/paths-filter@4512585405083f25c027a35db413c2b3b9006d50 # v2.11.1 + id: changes + continue-on-error: true + with: + filters: | + src: + - '.github/workflows/**' + - 'appinfo/**' + - 'lib/**' + - 'templates/**' + - 'tests/**' + - 'vendor/**' + - 'vendor-bin/**' + - '.php-cs-fixer.dist.php' + - 'composer.json' + - 'composer.lock' + phpunit-sqlite: runs-on: ubuntu-latest + needs: changes + if: needs.changes.outputs.src != 'false' + strategy: matrix: php-versions: ['8.2'] @@ -145,7 +153,7 @@ jobs: permissions: contents: none runs-on: ubuntu-latest - needs: phpunit-sqlite + needs: [changes, phpunit-sqlite] if: always() @@ -153,4 +161,4 @@ jobs: steps: - name: Summary status - run: if ${{ needs.phpunit-sqlite.result != 'success' }}; then exit 1; fi + run: if ${{ needs.changes.outputs.src != 'false' && needs.phpunit-sqlite.result != 'success' }}; then exit 1; fi diff --git a/.github/workflows/phpunit-summary-when-unrelated.yml b/.github/workflows/phpunit-summary-when-unrelated.yml deleted file mode 100644 index 484fdbb5b..000000000 --- a/.github/workflows/phpunit-summary-when-unrelated.yml +++ /dev/null @@ -1,68 +0,0 @@ -# This workflow is provided via the organization template repository -# -# https://github.com/nextcloud/.github -# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization - -name: PHPUnit summary - -on: - pull_request: - paths-ignore: - - '.github/workflows/**' - - 'appinfo/**' - - 'lib/**' - - 'templates/**' - - 'tests/**' - - 'vendor/**' - - 'vendor-bin/**' - - '.php-cs-fixer.dist.php' - - 'composer.json' - - 'composer.lock' - -permissions: - contents: read - -jobs: - summary-mysql: - permissions: - contents: none - runs-on: ubuntu-latest - - name: phpunit-mysql-summary - - steps: - - name: Summary status - run: 'echo "No PHP files changed, skipped PHPUnit"' - - summary-oci: - permissions: - contents: none - runs-on: ubuntu-latest - - name: phpunit-oci-summary - - steps: - - name: Summary status - run: 'echo "No PHP files changed, skipped PHPUnit"' - - summary-pgsql: - permissions: - contents: none - runs-on: ubuntu-latest - - name: phpunit-pgsql-summary - - steps: - - name: Summary status - run: 'echo "No PHP files changed, skipped PHPUnit"' - - summary-sqlite: - permissions: - contents: none - runs-on: ubuntu-latest - - name: phpunit-sqlite-summary - - steps: - - name: Summary status - run: 'echo "No PHP files changed, skipped PHPUnit"' diff --git a/.github/workflows/pr-feedback.yml b/.github/workflows/pr-feedback.yml index e85c4ecd7..0e7359dec 100644 --- a/.github/workflows/pr-feedback.yml +++ b/.github/workflows/pr-feedback.yml @@ -30,5 +30,5 @@ jobs: Thank you for contributing to Nextcloud and we hope to hear from you soon! days-before-feedback: 14 start-date: "2023-07-10" - exempt-authors: "${{ steps.scrape.outputs.users }},nextcloud-command,nextcloud-android-bot,skjnldsv" + exempt-authors: "${{ steps.scrape.outputs.users }},nextcloud-command,nextcloud-android-bot,skjnldsv,datenangebot" exempt-bots: true diff --git a/.github/workflows/psalm.yml b/.github/workflows/psalm.yml index 69e919d9b..302873bcd 100644 --- a/.github/workflows/psalm.yml +++ b/.github/workflows/psalm.yml @@ -5,14 +5,7 @@ name: Static analysis -on: - pull_request: - merge_group: - push: - branches: - - master - - main - - stable* +on: pull_request concurrency: group: psalm-${{ github.head_ref || github.run_id }} @@ -27,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@81cd5ae0920b34eef300e1775313071038a53429 # v2 with: - php-version: 8.1 + php-version: 8.2 coverage: none ini-file: development env: diff --git a/.github/workflows/update-nextcloud-ocp-matrix.yml b/.github/workflows/update-nextcloud-ocp-matrix.yml index 1cf0bf017..89494bfb0 100644 --- a/.github/workflows/update-nextcloud-ocp-matrix.yml +++ b/.github/workflows/update-nextcloud-ocp-matrix.yml @@ -28,10 +28,10 @@ jobs: ref: ${{ matrix.branches }} submodules: true - - name: Set up php8.0 + - name: Set up php8.2 uses: shivammathur/setup-php@81cd5ae0920b34eef300e1775313071038a53429 # 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