Merge pull request #399 from nextcloud/bugfix/noid/update-tooling

fix(CI): Update tooling

.github/CODEOWNERS

@@ -0,0 +1 @@
+/appinfo/info.xml @Blizzz @juliushaertl @nickvergessen

.github/workflows/appstore-build-publish.yml

@@ -32,7 +32,7 @@ jobs:
  echo "APP_VERSION=${GITHUB_REF##*/}" >> $GITHUB_ENV
 
  - name: Checkout
- uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+ uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
  with:
  path: ${{ env.APP_NAME }}
 
@@ -44,19 +44,19 @@ jobs:
  expression: "//info//dependencies//nextcloud/@min-version"
 
  - name: Read package.json node and npm engines version
- uses: skjnldsv/read-package-engines-version-actions@0ce2ed60f6df073a62a77c0a4958dd0fc68e32e7 # v2.1
+ uses: skjnldsv/read-package-engines-version-actions@8205673bab74a63eb9b8093402fd9e0e018663a1 # v2.2
  id: versions
  # Continue if no package.json
  continue-on-error: true
  with:
  path: ${{ env.APP_NAME }}
- fallbackNode: "^16"
- fallbackNpm: "^7"
+ fallbackNode: '^20'
+ fallbackNpm: '^9'
 
  - name: Set up node ${{ steps.versions.outputs.nodeVersion }}
  # Skip if no package.json
  if: ${{ steps.versions.outputs.nodeVersion }}
- uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3
+ uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3
  with:
  node-version: ${{ steps.versions.outputs.nodeVersion }}
 
@@ -66,7 +66,7 @@ jobs:
  run: npm i -g npm@"${{ steps.versions.outputs.npmVersion }}"
 
  - name: Set up php ${{ env.PHP_VERSION }}
- uses: shivammathur/setup-php@c5fc0d8281aba02c7fda07d3a70cc5371548067d # v2
+ uses: shivammathur/setup-php@4bd44f22a98a19e0950cbad5f31095157cc9621b # v2
  with:
  php-version: ${{ env.PHP_VERSION }}
  coverage: none
@@ -126,7 +126,7 @@ jobs:
  unzip latest-$NCVERSION.zip
 
  - name: Checkout server master fallback
- uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+ uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
  if: ${{ steps.server-checkout.outcome != 'success' }}
  with:
  submodules: true
@@ -149,7 +149,7 @@ jobs:
  tar -zcvf ${{ env.APP_NAME }}.tar.gz ${{ env.APP_NAME }}
 
  - name: Attach tarball to github release
- uses: svenstaro/upload-release-action@2b9d2847a97b04d02ad5c3df2d3a27baa97ce689 # v2
+ uses: svenstaro/upload-release-action@1beeb572c19a9242f4361f4cee78f8e0d9aec5df # v2
  id: attach_to_release
  with:
  repo_token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/dependabot-approve-merge.yml

@@ -0,0 +1,40 @@
+# 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: Dependabot
+
+on:
+ pull_request_target:
+ branches:
+ - main
+ - master
+ - stable*
+
+permissions:
+ contents: read
+
+concurrency:
+ group: dependabot-approve-merge-${{ github.head_ref || github.run_id }}
+ cancel-in-progress: true
+
+jobs:
+ auto-approve-merge:
+ if: github.actor == 'dependabot[bot]'
+ runs-on: ubuntu-latest
+ permissions:
+ # for hmarr/auto-approve-action to approve PRs
+ pull-requests: write
+
+ steps:
+ # Github actions bot approve
+ - uses: hmarr/auto-approve-action@b40d6c9ed2fa10c9a2749eca7eb004418a705501 # v2
+ with:
+ github-token: ${{ secrets.GITHUB_TOKEN }}
+
+ # Nextcloud bot approve and merge request
+ - uses: ahmadnassri/action-dependabot-auto-merge@45fc124d949b19b6b8bf6645b6c9d55f4f9ac61a # v2
+ with:
+ target: minor
+ github-token: ${{ secrets.DEPENDABOT_AUTOMERGE_TOKEN }}

.github/workflows/lint-info-xml.yml

@@ -27,7 +27,7 @@ jobs:
  name: info.xml lint
  steps:
  - name: Checkout
- uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+ uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
 
  - name: Download schema
  run: wget https://raw.githubusercontent.com/nextcloud/appstore/master/nextcloudappstore/api/v1/release/info.xsd

.github/workflows/lint-php-cs.yml

@@ -22,10 +22,10 @@ jobs:
 
  steps:
  - name: Checkout
- uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+ uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
 
  - name: Set up php
- uses: shivammathur/setup-php@c5fc0d8281aba02c7fda07d3a70cc5371548067d # v2
+ uses: shivammathur/setup-php@4bd44f22a98a19e0950cbad5f31095157cc9621b # v2
  with:
  php-version: 8.1
  coverage: none

.github/workflows/lint-php.yml

@@ -31,10 +31,10 @@ jobs:
 
  steps:
  - name: Checkout
- uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+ uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
 
  - name: Set up php ${{ matrix.php-versions }}
- uses: shivammathur/setup-php@c5fc0d8281aba02c7fda07d3a70cc5371548067d # v2
+ uses: shivammathur/setup-php@4bd44f22a98a19e0950cbad5f31095157cc9621b # v2
  with:
  php-version: ${{ matrix.php-versions }}
  coverage: none

.github/workflows/phpunit-oci.yml

@@ -34,7 +34,7 @@ concurrency:
 
 jobs:
  phpunit-oci:
- runs-on: ubuntu-latest
+ runs-on: ubuntu-22.04
 
  strategy:
  matrix:
@@ -69,19 +69,19 @@ jobs:
  echo "APP_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
 
  - name: Checkout server
- uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+ uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
  with:
  submodules: true
  repository: nextcloud/server
  ref: ${{ matrix.server-versions }}
 
  - name: Checkout app
- uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+ uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
  with:
  path: apps/${{ env.APP_NAME }}
 
  - name: Set up php ${{ matrix.php-versions }}
- uses: shivammathur/setup-php@c5fc0d8281aba02c7fda07d3a70cc5371548067d # v2
+ uses: shivammathur/setup-php@4bd44f22a98a19e0950cbad5f31095157cc9621b # v2
  with:
  php-version: ${{ matrix.php-versions }}
  # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation

.github/workflows/phpunit-pgsql.yml

@@ -59,19 +59,19 @@ jobs:
  echo "APP_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
 
  - name: Checkout server
- uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+ uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
  with:
  submodules: true
  repository: nextcloud/server
  ref: ${{ matrix.server-versions }}
 
  - name: Checkout app
- uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+ uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
  with:
  path: apps/${{ env.APP_NAME }}
 
  - name: Set up php ${{ matrix.php-versions }}
- uses: shivammathur/setup-php@c5fc0d8281aba02c7fda07d3a70cc5371548067d # v2
+ uses: shivammathur/setup-php@4bd44f22a98a19e0950cbad5f31095157cc9621b # v2
  with:
  php-version: ${{ matrix.php-versions }}
  # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation

.github/workflows/phpunit-sqlite.yml

@@ -48,19 +48,19 @@ jobs:
  echo "APP_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
 
  - name: Checkout server
- uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+ uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
  with:
  submodules: true
  repository: nextcloud/server
  ref: ${{ matrix.server-versions }}
 
  - name: Checkout app
- uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+ uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
  with:
  path: apps/${{ env.APP_NAME }}
 
  - name: Set up php ${{ matrix.php-versions }}
- uses: shivammathur/setup-php@c5fc0d8281aba02c7fda07d3a70cc5371548067d # v2
+ uses: shivammathur/setup-php@4bd44f22a98a19e0950cbad5f31095157cc9621b # v2
  with:
  php-version: ${{ matrix.php-versions }}
  # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation

.github/workflows/pr-feedback.yml

@@ -1,11 +1,16 @@
+# 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: 'Ask for feedback on PRs'
 on:
  schedule:
  - cron: '30 1 * * *'
 
 jobs:
  pr-feedback:
- runs-on: ubuntu-22.04
+ runs-on: ubuntu-latest
  steps:
  - name: The get-github-handles-from-website action
  uses: marcelklehr/get-github-handles-from-website-action@a739600f6b91da4957f51db0792697afbb2f143c # v1.0.0
@@ -18,12 +23,12 @@ jobs:
  Hello there,
  Thank you so much for taking the time and effort to create a pull request to our Nextcloud project. 
 
- We hope that the reviewing process is going smooth and is helpful for you. We want to ensure your pull request is reviewed to your satisfaction. If you have a moment, our community management team would very much appreciate your feedback on your experience with this PR reviewing process.
+ We hope that the review process is going smooth and is helpful for you. We want to ensure your pull request is reviewed to your satisfaction. If you have a moment, our community management team would very much appreciate your feedback on your experience with this PR review process.
 
  Your feedback is valuable to us as we continuously strive to improve our community developer experience. Please take a moment to complete our short survey by clicking on the following link: https://cloud.nextcloud.com/apps/forms/s/i9Ago4EQRZ7TWxjfmeEpPkf6
 
  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 }}"
+ exempt-authors: "${{ steps.scrape.outputs.users }},nextcloud-command,nextcloud-android-bot"
  exempt-bots: true

.github/workflows/update-nextcloud-ocp.yml

@@ -22,13 +22,16 @@ jobs:
  name: update-nextcloud-ocp-${{ matrix.branches }}
 
  steps:
- - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+ - id: checkout
+ uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
  with:
  ref: ${{ matrix.branches }}
  submodules: true
+ continue-on-error: true
 
  - name: Set up php8.1
- uses: shivammathur/setup-php@c5fc0d8281aba02c7fda07d3a70cc5371548067d # v2
+ if: steps.checkout.outcome == 'success'
+ uses: shivammathur/setup-php@4bd44f22a98a19e0950cbad5f31095157cc9621b # v2
  with:
  php-version: 8.1
  # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -37,37 +40,67 @@ jobs:
  env:
  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
+ - name: Read codeowners
+ if: steps.checkout.outcome == 'success'
+ id: codeowners
+ run: |
+ grep '/appinfo/info.xml' .github/CODEOWNERS | cut -f 2- -d ' ' | xargs | awk '{ print "codeowners="$0 }' >> $GITHUB_OUTPUT
+ continue-on-error: true
+
  - name: Composer install
+ if: steps.checkout.outcome == 'success'
  run: composer install
 
  - name: Composer update nextcloud/ocp
- if: matrix.branches != 'main'
+ id: update_branch
+ if: ${{ steps.checkout.outcome == 'success' && matrix.branches != 'main' }}
  run: composer require --dev nextcloud/ocp:dev-${{ matrix.branches }}
 
+ - name: Raise on issue on failure
+ uses: dacbd/create-issue-action@ba4d1c45cccf9c483f2720cefb40e437f0ee6f7d # v1.2.1
+ if: ${{ steps.checkout.outcome == 'success' && failure() && steps.update_branch.conclusion == 'failure' }}
+ with:
+ token: ${{ secrets.GITHUB_TOKEN }}
+ title: Failed to update nextcloud/ocp package on branch ${{ matrix.branches }}
+ body: Please check the output of the GitHub action and manually resolve the issues<br>${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}<br>${{ steps.codeowners.outputs.codeowners }}
+
  - name: Composer update nextcloud/ocp
- if: matrix.branches == 'main'
+ id: update_main
+ if: ${{ steps.checkout.outcome == 'success' && matrix.branches == 'main' }}
  run: composer require --dev nextcloud/ocp:dev-master
 
+ - name: Raise on issue on failure
+ uses: dacbd/create-issue-action@ba4d1c45cccf9c483f2720cefb40e437f0ee6f7d # v1.2.1
+ if: ${{ steps.checkout.outcome == 'success' && failure() && steps.update_main.conclusion == 'failure' }}
+ with:
+ token: ${{ secrets.GITHUB_TOKEN }}
+ title: Failed to update nextcloud/ocp package on branch ${{ matrix.branches }}
+ body: Please check the output of the GitHub action and manually resolve the issues<br>${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}<br>${{ steps.codeowners.outputs.codeowners }}
+
  - name: Reset checkout 3rdparty
+ if: steps.checkout.outcome == 'success'
  run: |
  git clean -f 3rdparty
  git checkout 3rdparty
  continue-on-error: true
 
  - name: Reset checkout vendor
+ if: steps.checkout.outcome == 'success'
  run: |
  git clean -f vendor
  git checkout vendor
  continue-on-error: true
 
  - name: Reset checkout vendor-bin
+ if: steps.checkout.outcome == 'success'
  run: |
  git clean -f vendor-bin
  git checkout vendor-bin
  continue-on-error: true
 
  - name: Create Pull Request
- uses: peter-evans/create-pull-request@284f54f989303d2699d373481a0cfa13ad5a6666 # v3
+ if: steps.checkout.outcome == 'success'
+ uses: peter-evans/create-pull-request@153407881ec5c347639a548ade7d8ad1d6740e38 # v3
  with:
  token: ${{ secrets.COMMAND_BOT_PAT }}
  commit-message: "chore(dev-deps): Bump nextcloud/ocp package"

composer.json

@@ -9,8 +9,9 @@
  "optimize-autoloader": true,
  "classmap-authoritative": true,
  "platform": {
- "php": "8.0"
- }
+ "php": "8.0.2"
+ },
+ "sort-packages": true
  },
  "scripts": {
  "cs:check": "php-cs-fixer fix --dry-run --diff",
@@ -20,8 +21,8 @@
  "test:integration": "cd tests/Integration && ./run.sh"
  },
  "require-dev": {
- "phpunit/phpunit": "^9.5",
- "nextcloud/coding-standard": "^1.0.0",
- "nextcloud/ocp": "dev-master"
+ "nextcloud/coding-standard": "^1.1",
+ "nextcloud/ocp": "dev-master",
+ "phpunit/phpunit": "^9.6"
  }
 }