Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

removed AE auth patch for NC master branch #39

Merged
merged 2 commits into from
Aug 10, 2023
Merged

removed AE auth patch for NC master branch #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
653ce59
fixed CI (0)
bigcat88 Aug 10, 2023
8ee5141
removed patches for nextcloud-docker-dev
bigcat88 Aug 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions .github/workflows/tests-deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down Expand Up @@ -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 \
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests-special.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 &
Expand Down