Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into feature/tilde-usernames
Browse files Browse the repository at this point in the history
  • Loading branch information
ylebre committed Oct 4, 2024
2 parents 7452d01 + 4e49e20 commit 85c715f
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 26 deletions.
12 changes: 5 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,9 @@ jobs:
# 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 @@ -83,17 +82,16 @@ jobs:
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
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.
]]></description>
<version>0.8.1</version>
<version>0.8.2</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="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

0 comments on commit 85c715f

Please sign in to comment.