Merge pull request #282 from nextcloud/feat/workflow-auto-update-phpunit-oci.yml

Updating phpunit-oci.yml workflow from template

1 files changed, 39 insertions, 2 deletions

diff --git a/.github/workflows/phpunit-oci.yml b/.github/workflows/phpunit-oci.yml
index 29b9cb2..3744e69 100644
--- a/.github/workflows/phpunit-oci.yml
+++ b/.github/workflows/phpunit-oci.yml
@@ -1,12 +1,37 @@
+# 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
 
 on:
   pull_request:
+    paths:
+      - '.github/workflows/**'
+      - 'appinfo/**'
+      - 'lib/**'
+      - 'templates/**'
+      - 'tests/**'
+      - 'vendor/**'
+      - 'vendor-bin/**'
+      - '.php-cs-fixer.dist.php'
+      - 'composer.json'
+      - 'composer.lock'
+
   push:
     branches:
+      - main
       - master
       - stable*
 
+permissions:
+  contents: read
+
+concurrency: 
+  group: phpunit-oci-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 env:
   # Location of the phpunit.xml and phpunit.integration.xml files
   PHPUNIT_CONFIG: ./tests/phpunit.xml
@@ -14,7 +39,7 @@ env:
 
 jobs:
   phpunit-oci:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
 
     strategy:
       matrix:
@@ -32,6 +57,7 @@ jobs:
         run: |
           # Split and keep last
           echo "APP_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
+
       - name: Checkout server
         uses: actions/checkout@v3
         with:
@@ -52,7 +78,15 @@ jobs:
           tools: phpunit
           coverage: none
 
+      - name: Check composer file existence
+        id: check_composer
+        uses: andstor/file-existence-action@v1
+        with:
+          files: apps/${{ env.APP_NAME }}/composer.json
+
       - name: Set up PHPUnit
+        # Only run if phpunit config file exists
+        if: steps.check_composer.outputs.files_exists == 'true'
         working-directory: apps/${{ env.APP_NAME }}
         run: composer i
 
@@ -62,7 +96,8 @@ jobs:
         run: |
           mkdir data
           ./occ maintenance:install --verbose --database=oci --database-name=XE --database-host=127.0.0.1 --database-port=$DB_PORT --database-user=autotest --database-pass=owncloud --admin-user admin --admin-pass admin
-          ./occ app:enable ${{ env.APP_NAME }}
+          ./occ app:enable --force ${{ env.APP_NAME }}
+
       - name: Check PHPUnit config file existence
         id: check_phpunit
         uses: andstor/file-existence-action@v1
@@ -93,6 +128,8 @@ jobs:
         run: ./vendor/phpunit/phpunit/phpunit -c ${{ env.PHPUNIT_INTEGRATION_CONFIG }}
 
   summary:
+    permissions:
+      contents: none
     runs-on: ubuntu-latest
     needs: phpunit-oci