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

Feature/nextcloud30 #156

Merged
merged 4 commits into from
Oct 4, 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
12 changes: 5 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +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
- 28
- 29
- 30

steps:
- name: Create docker tag from git reference
Expand Down Expand Up @@ -70,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 @@ -83,17 +82,16 @@
fail-fast: false
matrix:
nextcloud_version:
- 25
- 26
- 27
- 28
- 29
- 30
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,26,27,28]'), matrix.nextcloud_version) == false }}
continue-on-error: ${{ contains(fromJson('[28,29,30]'), matrix.nextcloud_version) == false }}

steps:
- name: Create docker tag from git reference
Expand Down
2 changes: 1 addition & 1 deletion solid/appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ When you do this, the Solid App can store data in your Nextcloud account through
<category>integration</category>
<bugs>https://github.com/pdsinterop/solid-nextcloud/issues</bugs>
<dependencies>
<nextcloud min-version="25" max-version="28"/>
<nextcloud min-version="28" max-version="30"/>
</dependencies>
<settings>
<admin>\OCA\Solid\Settings</admin>
Expand Down
21 changes: 4 additions & 17 deletions solid/lib/solid-app-list.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,30 +38,17 @@
]
},
{
"name": "Generator demo",
"tagline": "Output of Inrupt's generator for Solid React Applications",
"launchUrl": "https://generator.inrupt.com/",
"appOrigin" : "https://generator.inrupt.com",
"name": "Media Kraken",
"tagline": "Media Kraken",
"launchUrl": "https://noeldemartin.github.io/media-kraken/",
"appOrigin" : "https://noeldemartin.github.io",
"requirements": [
{
"type": "podWide",
"permissions": ["acl.Read", "acl.Append", "acl.Write", "acl.Control"]
},
{
"type": "container",
"container": "tictactoe",
"permissions": ["acl.Read", "acl.Append", "acl.Write", "acl.Control"]
}
]
},
{
"name": "App demo",
"tagline": "App demo",
"launchUrl": "https://empty-solid-app.5apps.com/",
"appOrigin" : "https://empty-solid-app.5apps.com",
"requirements": [
]
},
{
"name": "Focus",
"tagline": "Solid Task Manager",
Expand Down
Loading