Merge pull request #942 from nextcloud/ci/bump-default-php

ci: bump default php and apps version

Author: saw-jan

.github/scripts/generate-matrix.sh

@@ -57,7 +57,7 @@ function parsePHPVersion() {
 }
 
 # Default values
-defaultPhpVersion="8.2"
+defaultPhpVersion="8.3"
 if [ -n "$DEFAULT_PHP_VERSION" ]; then
     checkPHPVersionFormat "$DEFAULT_PHP_VERSION"
     defaultPhpVersion=$(parsePHPVersion "$DEFAULT_PHP_VERSION")
@@ -155,8 +155,6 @@ for ncVersion in $nextcloudVersions; do
         phpVersion="8.1"
     elif [ "$ncVersion" = "stable30" ]; then
         phpVersion="8.2"
-    elif [ "$ncVersion" = "master" ]; then
-        phpVersion="8.3"
     else
         phpVersion="$defaultPhpVersion"
     fi

.github/workflows/shared_workflow.yml

@@ -23,25 +23,20 @@ jobs:
     name: js lint and unit tests
     runs-on: ubuntu-22.04
     steps:
-      - name: Checkout for nightly CI
-        if: github.event_name == 'schedule'
-        uses: actions/checkout@v3
+      - name: Checkout
+        uses: actions/checkout@v6
         with:
           ref: ${{ inputs.branch }}
 
-      - name: Checkout
-        if: github.event_name != 'schedule'
-        uses: actions/checkout@v3
-
       - name: Read package.json node and npm engines version
-        uses: skjnldsv/read-package-engines-version-actions@v2
+        uses: skjnldsv/read-package-engines-version-actions@v3
         id: versions
         with:
-          fallbackNode: '^14'
-          fallbackNpm: '^7'
+          fallbackNode: '^20'
+          fallbackNpm: '^10'
 
       - name: Setup NodeJS ${{ steps.versions.outputs.nodeVersion }}
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v6
         with:
           node-version: ${{ steps.versions.outputs.nodeVersion }}
           cache: 'npm'
@@ -78,22 +73,17 @@ jobs:
   create-matrix:
     runs-on: ubuntu-22.04
     steps:
-      - name: Checkout for nightly CI
-        if: github.event_name == 'schedule'
-        uses: actions/checkout@v3
+      - name: Checkout
+        uses: actions/checkout@v6
         with:
           ref: ${{ inputs.branch }}
 
-      - name: Checkout
-        if: github.event_name != 'schedule'
-        uses: actions/checkout@v3
-
       - name: Create matrix
         id: create-matrix
         env:
           NEXTCLOUD_VERSIONS: ${{ inputs.nextcloud_versions }}
           PHP_VERSIONS: ${{ inputs.php_versions }}
-          DEFAULT_PHP_VERSION: "8.2"
+          DEFAULT_PHP_VERSION: "8.3"
           DEFAULT_DATABASE: "mysql"
           EXTRA_DATABASES: "pgsql"
         run: |
@@ -121,11 +111,9 @@ jobs:
           SQL: ${{ matrix.database }}
           SERVER_BRANCH: ${{ matrix.nextcloudVersion }}
           NEXTCLOUD_AUTOINSTALL: "Yes"
-          NEXTCLOUD_AUTOINSTALL_APPS: "viewer activity groupfolders integration_openproject"
           NEXTCLOUD_TRUSTED_DOMAINS: nextcloud
           VIRTUAL_HOST: "nextcloud"
           WITH_REDIS: "YES"
-          NEXTCLOUD_AUTOINSTALL_APPS_WAIT_TIME: 120
         ports:
           - 80:80
         options: --name=nextcloud
@@ -151,57 +139,49 @@ jobs:
         options: --health-cmd="redis-cli ping" --health-interval=10s --health-timeout=5s --health-retries=3
 
     steps:
-      - name: Checkout for nightly CI
-        if: github.event_name == 'schedule'
-        uses: actions/checkout@v3
+      - name: Checkout
+        uses: actions/checkout@v6
         with:
           path: integration_openproject
           ref: ${{ inputs.branch }}
 
-      - name: Checkout
-        if: github.event_name != 'schedule'
-        uses: actions/checkout@v3
+      - name: Checkout server (for phpunit and psalm)
+        uses: actions/checkout@v6
         with:
-          path: integration_openproject
+          submodules: true
+          repository: nextcloud/server
+          path: integration_openproject/server
+          ref: ${{ matrix.nextcloudVersion }}
 
-      - name: Checkout activity app
-        uses: actions/checkout@v3
+      # activity app cannot be installed using occ command
+      - name: Checkout (activity)
+        uses: actions/checkout@v6
         with:
           repository: nextcloud/activity
-          path: activity
           ref: ${{ matrix.nextcloudVersion }}
+          path: activity
 
-      - name: Checkout groupfolders app
-        uses: actions/checkout@v3
+      - name: Checkout (groupfolders)
+        uses: actions/checkout@v6
+        if: ${{ matrix.nextcloudVersion == 'master' }}
         with:
           repository: nextcloud/groupfolders
           path: groupfolders
-          ref: ${{ matrix.nextcloudVersion }}
 
-      - name: Checkout user_oidc app
-        uses: actions/checkout@v3
+      - name: Checkout (user_oidc)
+        uses: actions/checkout@v6
+        if: ${{ matrix.nextcloudVersion == 'master' }}
         with:
           repository: nextcloud/user_oidc
-          ref: v7.2.0
-          fetch-tags: true
           path: user_oidc
 
-      - name: Checkout oidc app
-        uses: actions/checkout@v3
+      - name: Checkout (oidc)
+        uses: actions/checkout@v6
+        if: ${{ matrix.nextcloudVersion == 'master' }}
         with:
           repository: h2CK/oidc
-          ref: 1.14.1
-          fetch-tags: true
           path: oidc
 
-      - name: Checkout server (for phpunit and psalm)
-        uses: actions/checkout@v3
-        with:
-          submodules: true
-          repository: nextcloud/server
-          path: integration_openproject/server
-          ref: ${{ matrix.nextcloudVersion }}
-
       - name: Setup PHP ${{ format('{0}.{1}', matrix.phpVersionMajor,matrix.phpVersionMinor) }}
         uses: shivammathur/setup-php@v2
         with:
@@ -215,37 +195,45 @@ jobs:
         run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - name: Cache PHP dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('./composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
 
-      - name: Setup server and apps
-        run: |
-          # integration_openproject app
-          composer install --no-progress --prefer-dist --optimize-autoloader
-          # user_oidc app
-          composer install --no-interaction --prefer-dist --optimize-autoloader --working-dir=../user_oidc
-          cd server && ./occ maintenance:install --admin-pass=admin
+      - name: Install PHP dependencies
+        run: composer install --no-progress --prefer-dist --optimize-autoloader
+
+      - name: Prepare Nextcloud server (for phpunit and psalm)
+        run: server/occ maintenance:install --admin-pass=admin
 
       - name: PHP code analysis and linting
         run: |
           make psalm
           make phpcs || ( echo 'Please run `make phpcs-fix` to format your code' && exit 1 )
 
-      - name: Enable apps
+      - name: Copy dependent apps
+        run: |
+          composer install --no-dev --no-interaction --prefer-dist --optimize-autoloader --working-dir=../activity
+          cp -r ../activity server/apps
+          if [ "${{matrix.nextcloudVersion}}" == "master" ]; then
+            composer install --no-dev --no-interaction --prefer-dist --optimize-autoloader --working-dir=../user_oidc
+            composer install --no-dev --no-interaction --prefer-dist --optimize-autoloader --working-dir=../oidc
+            composer install --no-dev --no-interaction --prefer-dist --optimize-autoloader --working-dir=../groupfolders
+            cp -r ../oidc ../user_oidc ../groupfolders server/apps
+          fi
+
+      - name: Enable apps (for phpunit)
         run: |
           mkdir -p server/apps/integration_openproject
           cp -r `ls -A | grep -v 'server'` server/apps/integration_openproject/
-          cp -r ../groupfolders ../activity server/apps
           cd server
-          ./occ a:e groupfolders integration_openproject activity
-          if [ "${{matrix.nextcloudVersion}}" != "stable27" ]; then
-            cp -r ../../user_oidc ../../oidc apps
-            ./occ a:e -f user_oidc
-            # enable app even if it is not compatible with the current server version
-            ./occ a:e -f oidc
+          if [ "${{matrix.nextcloudVersion}}" == "master" ]; then
+            # enable app even if it is not compatible with the master branch
+            ./occ a:e -f activity oidc user_oidc groupfolders integration_openproject
+          else
+            ./occ a:e activity oidc user_oidc groupfolders integration_openproject
+            cp -r apps/oidc apps/user_oidc apps/groupfolders ${{ github.workspace }}
           fi
 
       - name: PHP Unit Tests
@@ -255,7 +243,7 @@ jobs:
 
       - name: Setup .NET Core # this is required to execute Convert PHP cobertura coverage to lcov step
         if: ${{ github.event_name == 'pull_request' && matrix.nextcloudVersion == 'stable32' && matrix.phpVersion == '8.2' }}
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v5
         with:
           dotnet-version: 6.0.101
           dotnet-quality: 'ga'
@@ -299,12 +287,16 @@ jobs:
         run: |
           # Disable share rate limit protection
           docker exec nextcloud /bin/bash -c 'occ config:system:set ratelimit.protection.enabled --value false --type bool'
+          # Enable apps
+          if [ "${{matrix.nextcloudVersion}}" == "master" ]; then
+            # enable app even if it is not compatible with the master branch
+            docker exec nextcloud /bin/bash -c 'occ a:e -f activity oidc user_oidc groupfolders integration_openproject'
+          else
+            docker exec nextcloud /bin/bash -c 'occ a:e activity oidc user_oidc groupfolders integration_openproject'
+          fi
 
-      - name: API Tests
-        env:
-          NEXTCLOUD_BASE_URL: http://localhost
+      - name: Wait for Nextcloud server to be ready
         run: |
-          composer install --no-progress --prefer-dist --optimize-autoloader
           if ! timeout 5m bash -c '
             until curl -s -f http://localhost/status.php | grep '"'"'"installed":true'"'"'; do
               echo "[INFO] Waiting for server to be ready..."
@@ -314,7 +306,11 @@ jobs:
             echo "[ERROR] Server not ready within 5 minutes."
             exit 1
           fi
-          make api-test
+
+      - name: API Tests
+        env:
+          NEXTCLOUD_BASE_URL: http://localhost
+        run: make api-test
 
   notify-nightly-report:
     needs:
@@ -324,7 +320,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v6
 
       - name: Notify nightly report to element
         env:
@@ -336,4 +332,4 @@ jobs:
           REPO_NAME: integration_openproject
           RUN_ID: ${{ github.run_id }}
           BRANCH_NAME: ${{ inputs.branch }}
-        run: ./.github/scripts/notify-to-element.sh
+        run: ./.github/scripts/notify-to-element.sh