From 5a9f41d5685f4a6c96812b5c09e35c997d28c0a1 Mon Sep 17 00:00:00 2001
From: Alexander Piskun <13381981+bigcat88@users.noreply.github.com>
Date: Thu, 10 Aug 2023 22:06:17 +0300
Subject: [PATCH] removed AE auth patch for NC master branch (#39)

As this was merged, we do not need Authentication patch anymore for
Nextcloud core.

https://github.com/nextcloud/server/pull/39655

---------

Signed-off-by: Alexander Piskun <bigcat88@icloud.com>
---
 .github/workflows/tests-deploy.yml  | 13 ++++++++-----
 .github/workflows/tests-special.yml |  2 +-
 .github/workflows/tests.yml         |  5 ++++-
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/tests-deploy.yml b/.github/workflows/tests-deploy.yml
index b080be56..aa0bf192 100644
--- a/.github/workflows/tests-deploy.yml
+++ b/.github/workflows/tests-deploy.yml
@@ -94,7 +94,10 @@ jobs:
           ./occ config:system:set allow_local_remote_servers --value true
           ./occ app:enable notifications
           ./occ app:enable --force ${{ env.APP_NAME }}
-          patch -p 1 -i apps/${{ env.APP_NAME }}/base_php.patch
+
+      - name: Patch base.php
+        if: ${{ !startsWith(matrix.server-version, 'master') }}
+        run: patch -p 1 -i apps/${{ env.APP_NAME }}/base_php.patch
 
       - name: Test deploy
         run: |
@@ -165,7 +168,6 @@ jobs:
           docker exec -w /var/www/html/apps nextcloud git clone https://github.com/cloud-py-api/${{ env.APP_NAME }}.git
           docker exec -w /var/www/html/apps/${{ env.APP_NAME }} nextcloud git fetch origin $GITHUB_REF
           docker exec -w /var/www/html/apps/${{ env.APP_NAME }} nextcloud git checkout FETCH_HEAD
-          docker exec nextcloud patch -p 1 -i apps/${{ env.APP_NAME }}/base_php.patch
           docker exec nextcloud sudo -u www-data php occ app:enable app_ecosystem_v2
           docker exec nextcloud sudo -u www-data php occ app_ecosystem_v2:daemon:register \
             docker_local_sock Docker docker-install unix-socket /var/run/docker.sock http://nextcloud/index.php \
@@ -241,7 +243,6 @@ jobs:
           docker exec -w /var/www/html/apps nextcloud git clone https://github.com/cloud-py-api/${{ env.APP_NAME }}.git
           docker exec -w /var/www/html/apps/${{ env.APP_NAME }} nextcloud git fetch origin $GITHUB_REF
           docker exec -w /var/www/html/apps/${{ env.APP_NAME }} nextcloud git checkout FETCH_HEAD
-          docker exec nextcloud patch -p 1 -i apps/${{ env.APP_NAME }}/base_php.patch
           docker exec nextcloud sudo -u www-data php occ app:enable app_ecosystem_v2
           docker cp ./certs/client/ nextcloud:/
           docker exec nextcloud sudo -u www-data php occ security:certificates:import /client/ca.pem
@@ -318,7 +319,6 @@ jobs:
           docker exec -w /var/www/html/apps nextcloud git clone https://github.com/cloud-py-api/${{ env.APP_NAME }}.git
           docker exec -w /var/www/html/apps/${{ env.APP_NAME }} nextcloud git fetch origin $GITHUB_REF
           docker exec -w /var/www/html/apps/${{ env.APP_NAME }} nextcloud git checkout FETCH_HEAD
-          docker exec nextcloud patch -p 1 -i apps/${{ env.APP_NAME }}/base_php.patch
           docker exec nextcloud sudo -u www-data php occ app:enable app_ecosystem_v2
           docker cp ./certs/client/ nextcloud:/
           docker exec nextcloud sudo -u www-data php occ security:certificates:import /client/ca.pem
@@ -462,7 +462,10 @@ jobs:
           ./occ config:system:set redis port --value ${{ env.REDIS_PORT }}
 
           ./occ app:enable --force ${{ env.APP_NAME }}
-          patch -p 1 -i apps/${{ env.APP_NAME }}/base_php.patch
+
+      - name: Patch base.php
+        if: ${{ !startsWith(matrix.server-version, 'master') }}
+        run: patch -p 1 -i apps/${{ env.APP_NAME }}/base_php.patch
 
       - name: Test deploy
         run: |
diff --git a/.github/workflows/tests-special.yml b/.github/workflows/tests-special.yml
index d5ef570a..bff16b02 100644
--- a/.github/workflows/tests-special.yml
+++ b/.github/workflows/tests-special.yml
@@ -135,7 +135,7 @@ jobs:
           path: data/nextcloud.log
           if-no-files-found: warn
 
-  tests-success:
+  tests-special-success:
     permissions:
       contents: none
     runs-on: ubuntu-22.04
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 9bb811ec..eb10b87e 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -103,7 +103,10 @@ jobs:
           ./occ config:system:set allow_local_remote_servers --value true
           ./occ app:enable notifications
           ./occ app:enable --force ${{ env.APP_NAME }}
-          patch -p 1 -i apps/${{ env.APP_NAME }}/base_php.patch
+
+      - name: Patch base.php
+        if: ${{ !startsWith(matrix.server-version, 'master') }}
+        run: patch -p 1 -i apps/${{ env.APP_NAME }}/base_php.patch
 
       - name: Run Nextcloud
         run: php -S 127.0.0.1:8080 &