feat(server): master works now with upcoming NC 28

- support for older versions in stable-5.2 branch Signed-off-by: Arthur Schiwon <[email protected]>
nextcloud · Sep 6, 2023 · 0927b44 · 0927b44
1 parent 8ee81d5
commit 0927b44
Show file tree

Hide file tree

Showing 20 changed files with 123 additions and 205 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -34,114 +34,6 @@ trigger:
 
 type: docker
 
----
-kind: pipeline
-name: integration-tests-stable27
-
-clone:
-  depth: 1
-
-steps:
-  - name: integration-tests-stable27
-    image: ghcr.io/nextcloud/continuous-integration-user_saml_shibboleth-php8.0:latest
-    environment:
-      CORE_BRANCH: stable27
-    commands:
-      - /start.sh
-      - /wait-for-services.sh
-      - rm -rf /var/www/html
-      - cd /var/www/
-      - git clone --depth 1 -b $CORE_BRANCH https://github.com/nextcloud/server html
-      - cd /var/www/html && git submodule update --init
-      # use local clone
-      - cp -r /drone/src /var/www/html/apps/user_saml
-      - php /var/www/html/occ maintenance:install --database sqlite --admin-pass password
-      - php /var/www/html/occ app:enable user_saml
-      - chown -R apache:apache /var/www/html/
-      - cd /var/www/html/apps/user_saml/tests/integration && vendor/bin/behat
-
-trigger:
-  branch:
-    - master
-    - stable*
-  event:
-    - pull_request
-    - push
-
-type: docker
-
----
-kind: pipeline
-name: integration-tests-stable26
-
-clone:
-  depth: 1
-
-steps:
-  - name: integration-tests-stable26
-    image: ghcr.io/nextcloud/continuous-integration-user_saml_shibboleth-php8.0:latest
-    environment:
-      CORE_BRANCH: stable26
-    commands:
-      - /start.sh
-      - /wait-for-services.sh
-      - rm -rf /var/www/html
-      - cd /var/www/
-      - git clone --depth 1 -b $CORE_BRANCH https://github.com/nextcloud/server html
-      - cd /var/www/html && git submodule update --init
-      # use local clone
-      - cp -r /drone/src /var/www/html/apps/user_saml
-      - php /var/www/html/occ maintenance:install --database sqlite --admin-pass password
-      - php /var/www/html/occ app:enable user_saml
-      - chown -R apache:apache /var/www/html/
-      - cd /var/www/html/apps/user_saml/tests/integration && vendor/bin/behat
-
-trigger:
-  branch:
-    - master
-    - stable*
-  event:
-    - pull_request
-    - push
-
-type: docker
-
-
----
-kind: pipeline
-name: integration-tests-stable25
-
-clone:
-  depth: 1
-
-steps:
-  - name: integration-tests-stable25
-    image: ghcr.io/nextcloud/continuous-integration-user_saml_shibboleth-php8.0:latest
-    environment:
-      CORE_BRANCH: stable25
-    commands:
-      - /start.sh
-      - /wait-for-services.sh
-      - rm -rf /var/www/html
-      - cd /var/www/
-      - git clone --depth 1 -b $CORE_BRANCH https://github.com/nextcloud/server html
-      - cd /var/www/html && git submodule update --init
-      # use local clone
-      - cp -r /drone/src /var/www/html/apps/user_saml
-      - php /var/www/html/occ maintenance:install --database sqlite --admin-pass password
-      - php /var/www/html/occ app:enable user_saml
-      - chown -R apache:apache /var/www/html/
-      - cd /var/www/html/apps/user_saml/tests/integration && vendor/bin/behat
-
-trigger:
-  branch:
-    - master
-    - stable*
-  event:
-    - pull_request
-    - push
-
-type: docker
 ---
 kind: signature
-hmac: dfe8bed25880588c11b4a668b657c7aed55331d566ea755803ad6766cffd088c
+hmac: 6ca48f8c8e9ea9cc6dcc01f8d18193156a2f8b41f94ddf5fa8e74534fa08dbd8
diff --git a/.github/workflows/appstore-build-publish.yml b/.github/workflows/appstore-build-publish.yml
@@ -10,7 +10,7 @@ on:
     types: [published]
 
 env:
-  PHP_VERSION: 7.4
+  PHP_VERSION: 8.0
 
 jobs:
   build_and_publish:
@@ -32,7 +32,7 @@ jobs:
           echo "APP_VERSION=${GITHUB_REF##*/}" >> $GITHUB_ENV
 
       - name: Checkout
-        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
         with:
           path: ${{ env.APP_NAME }}
 
@@ -50,13 +50,13 @@ jobs:
         continue-on-error: true
         with:
           path: ${{ env.APP_NAME }}
-          fallbackNode: "^12"
-          fallbackNpm: "^6"
+          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@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3
+        uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d # v3
         with:
           node-version: ${{ steps.versions.outputs.nodeVersion }}
 
@@ -88,6 +88,8 @@ jobs:
       - name: Build ${{ env.APP_NAME }}
         # Skip if no package.json
         if: ${{ steps.versions.outputs.nodeVersion }}
+        env:
+          CYPRESS_INSTALL_BINARY: 0
         run: |
           cd ${{ env.APP_NAME }}
           npm ci
@@ -126,7 +128,7 @@ jobs:
           unzip latest-$NCVERSION.zip
 
       - name: Checkout server master fallback
-        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
         if: ${{ steps.server-checkout.outcome != 'success' }}
         with:
           submodules: true
@@ -149,7 +151,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 }}

diff --git a/.github/workflows/command-rebase.yml b/.github/workflows/command-rebase.yml
diff --git a/.github/workflows/composer.yml b/.github/workflows/composer.yml
@@ -19,7 +19,7 @@ jobs:
     - name: install dependencies
       uses: php-actions/composer@v5
       with:
-        php_version: 7.4
+        php_version: 8.0
         version: 1
         args: -d ./3rdparty/
 

diff --git a/.github/workflows/lint-info-xml.yml b/.github/workflows/lint-info-xml.yml
@@ -27,7 +27,7 @@ jobs:
     name: info.xml lint
     steps:
       - name: Checkout
-        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
 
       - name: Download schema
         run: wget https://raw.githubusercontent.com/nextcloud/appstore/master/nextcloudappstore/api/v1/release/info.xsd

diff --git a/.github/workflows/lint-php-cs.yml b/.github/workflows/lint-php-cs.yml
@@ -22,12 +22,12 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
 
       - name: Set up php
         uses: shivammathur/setup-php@4bd44f22a98a19e0950cbad5f31095157cc9621b # v2
         with:
-          php-version: "7.4"
+          php-version: 8.1
           coverage: none
           ini-file: development
         env:

diff --git a/.github/workflows/lint-php.yml b/.github/workflows/lint-php.yml
@@ -25,13 +25,13 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-versions: ["7.4", "8.0", "8.1", "8.2"]
+        php-versions: [ "8.0", "8.1", "8.2" ]
 
     name: php-lint
 
     steps:
       - name: Checkout
-        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
 
       - name: Set up php ${{ matrix.php-versions }}
         uses: shivammathur/setup-php@4bd44f22a98a19e0950cbad5f31095157cc9621b # v2

diff --git a/.github/workflows/phpunit-mysql.yml b/.github/workflows/phpunit-mysql.yml
@@ -57,14 +57,14 @@ jobs:
           echo "APP_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
 
       - name: Checkout server
-        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
         with:
           submodules: true
           repository: nextcloud/server
           ref: ${{ matrix.server-versions }}
 
       - name: Checkout app
-        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
         with:
           path: apps/${{ env.APP_NAME }}
 

diff --git a/.github/workflows/phpunit-oci.yml b/.github/workflows/phpunit-oci.yml
@@ -34,7 +34,7 @@ concurrency:
 
 jobs:
   phpunit-oci:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
 
     strategy:
       matrix:
@@ -69,14 +69,14 @@ jobs:
           echo "APP_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
 
       - name: Checkout server
-        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
         with:
           submodules: true
           repository: nextcloud/server
           ref: ${{ matrix.server-versions }}
 
       - name: Checkout app
-        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
         with:
           path: apps/${{ env.APP_NAME }}
 

diff --git a/.github/workflows/phpunit-pgsql.yml b/.github/workflows/phpunit-pgsql.yml
@@ -59,14 +59,14 @@ jobs:
           echo "APP_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
 
       - name: Checkout server
-        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
         with:
           submodules: true
           repository: nextcloud/server
           ref: ${{ matrix.server-versions }}
 
       - name: Checkout app
-        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
         with:
           path: apps/${{ env.APP_NAME }}
 

diff --git a/.github/workflows/phpunit-sqlite.yml b/.github/workflows/phpunit-sqlite.yml
@@ -38,32 +38,24 @@ jobs:
 
     strategy:
       matrix:
-        php-versions: ['8.0', '8.1']
-        server-versions: ['stable25', 'stable26', 'stable27', 'master']
-        include:
-          - php-versions: '8.2'
-            server-versions: 'master'
-          - php-versions: '8.2'
-            server-versions: 'stable27'
-          - php-versions: '8.2'
-            server-versions: 'stable26'
-          - php-versions: '7.4'
-            server-versions: 'stable25'
+        php-versions: ['8.0']
+        server-versions: ['master']
+
     steps:
       - name: Set app env
         run: |
           # Split and keep last
           echo "APP_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
 
       - name: Checkout server
-        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
         with:
           submodules: true
           repository: nextcloud/server
           ref: ${{ matrix.server-versions }}
 
       - name: Checkout app
-        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
         with:
           path: apps/${{ env.APP_NAME }}