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.

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

Update to support up to Nextcloud 27 #142

Merged
merged 8 commits into from
Jan 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,15 @@
runs-on: ubuntu-latest
strategy:
matrix:
# For the latest version information see: https://github.com/nextcloud/server/wiki/Maintenance-and-Release-Schedule

Check warning on line 31 in .github/workflows/ci.yml

View workflow job for this annotation

GitHub Actions / lint-yaml

31:121 [line-length] line too long (123 > 120 characters)

Check warning on line 31 in .github/workflows/ci.yml

View workflow job for this annotation

GitHub Actions / lint-yaml

31:121 [line-length] line too long (123 > 120 characters)
# Versions before 22 are not tested as they run on PHP versions lower than 8.0
# Versions before 24 are not tested as they do not support `.well-known` entries
# Version 24 comes with PHP 8.0, which is no longer supported;
# Latest is not tested here, as that could cause failures unrelated to project changes
nextcloud_version:
- 25
- 26
- 27

steps:
- name: Create docker tag from git reference
Expand Down Expand Up @@ -67,7 +69,7 @@
.
docker push "ghcr.io/pdsinterop/solid-nextcloud:${{ env.TAG }}"
mkdir -p cache/solid-nextcloud
docker image save solid-nextcloud:${{ env.TAG }} --output ./cache/solid-nextcloud/${{ github.sha }}-${{ matrix.nextcloud_version }}.tar

Check warning on line 72 in .github/workflows/ci.yml

View workflow job for this annotation

GitHub Actions / lint-yaml

72:121 [line-length] line too long (145 > 120 characters)

Check warning on line 72 in .github/workflows/ci.yml

View workflow job for this annotation

GitHub Actions / lint-yaml

72:121 [line-length] line too long (145 > 120 characters)

solid-testsuite:
timeout-minutes: 30
Expand All @@ -81,13 +83,15 @@
matrix:
nextcloud_version:
- 25
- 26
- 27
test:
- 'solidtestsuite/solid-crud-tests:v7.0.5'
- 'solidtestsuite/web-access-control-tests:v7.1.0'
- 'solidtestsuite/webid-provider-tests:v2.1.0'

# Prevent EOL or non-stable versions of Nextcloud to fail the test-suite
continue-on-error: ${{ contains(fromJson('[25]'), matrix.nextcloud_version) == false }}
continue-on-error: ${{ contains(fromJson('[25,26,27]'), matrix.nextcloud_version) == false }}

steps:
- name: Create docker tag from git reference
Expand Down
8 changes: 4 additions & 4 deletions init-live.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ export PHP_MEMORY_LIMIT="512M"
php console.php maintenance:install --admin-user admin --admin-pass $MARIADB_ROOT_PASSWORD --database "mysql" --database-name "nextcloud" --database-user "root" --database-pass "$MARIADB_ROOT_PASSWORD" --database-host "127.0.0.1"
php console.php status
php console.php app:enable solid
sed -i "25 i\ 1 => 'server'," /var/www/html/config/config.php
sed -i "26 i\ 2 => 'nextcloud.local'," /var/www/html/config/config.php
sed -i "27 i\ 3 => 'thirdparty'," /var/www/html/config/config.php
sed -i "28 i\ 4 => '$HOST'," /var/www/html/config/config.php
php console.php config:system:set trusted_domains 1 --value=server
php console.php config:system:set trusted_domains 2 --value=nextcloud.local
php console.php config:system:set trusted_domains 3 --value=thirdparty
php console.php config:system:set trusted_domains 4 --value=$HOST
echo configured
6 changes: 3 additions & 3 deletions init.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ export PHP_MEMORY_LIMIT="512M"
php console.php maintenance:install --admin-user alice --admin-pass alice123
php console.php status
php console.php app:enable solid
sed -i "25 i\ 1 => 'server'," /var/www/html/config/config.php
sed -i "26 i\ 2 => 'nextcloud.local'," /var/www/html/config/config.php
sed -i "27 i\ 3 => 'thirdparty'," /var/www/html/config/config.php
php console.php config:system:set trusted_domains 1 --value=server
php console.php config:system:set trusted_domains 2 --value=nextcloud.local
php console.php config:system:set trusted_domains 3 --value=thirdparty
echo configured
4 changes: 2 additions & 2 deletions solid/appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ It supports the webid-oidc-dpop-pkce login flow to connect to a Solid App with y
When you do this, the Solid App can store data in your Nextcloud account through the Solid protocol.
IMPORTANT: See https://github.com/pdsinterop/solid-nextcloud/blob/main/INSTALL.md for additional install instructions!
]]></description>
<version>0.7.2</version>
<version>0.7.3</version>
<licence>agpl</licence>
<author mail="[email protected]" >Auke van Slooten</author>
<namespace>Solid</namespace>
<category>integration</category>
<bugs>https://github.com/pdsinterop/solid-nextcloud/issues</bugs>
<dependencies>
<nextcloud min-version="25" max-version="25"/>
<nextcloud min-version="25" max-version="27"/>
</dependencies>
<settings>
<admin>\OCA\Solid\Settings</admin>
Expand Down
Loading