Skip to content
Draft
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
18 changes: 11 additions & 7 deletions .github/workflows/solid-tests-suites.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,7 @@ 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:
- 28
- 29
- 30
- 31

steps:
- name: Create docker tag from git reference
Expand Down Expand Up @@ -82,16 +80,14 @@ jobs:
fail-fast: false
matrix:
nextcloud_version:
- 28
- 29
- 30
- 31
test:
- 'solidtestsuite/solid-crud-tests:v7.0.5'
- 'solidtestsuite/web-access-control-tests:v7.1.0'
- 'solidtestsuite/webid-provider-tests:v2.1.1'

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

steps:
- name: Create docker tag from git reference
Expand Down Expand Up @@ -140,6 +136,9 @@ jobs:
echo "COOKIE_server=${COOKIE_server}" >> "${GITHUB_ENV}"
echo "COOKIE_thirdparty=${COOKIE_thirdparty}" >> "${GITHUB_ENV}"

# - name: Setup tmate session
# uses: mxschmitt/action-tmate@v3

- name: Run tests - ${{ matrix.test }}
run: |
export COOKIE_server="${{ env.COOKIE_server }}"
Expand All @@ -152,3 +151,8 @@ jobs:
--env COOKIE_BOB="$COOKIE_thirdparty" \
--env-file ./env-vars-testers.list \
${{ matrix.test }}

- name: Show nextcloud logs - ${{ matrix.test }}
if: always()
run: |
docker exec -i server cat /var/www/html/data/nextcloud.log
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="28" max-version="30"/>
<nextcloud min-version="29" max-version="31"/>
</dependencies>
<settings>
<admin>OCA\Solid\Settings\SolidAdmin</admin>
Expand Down
4 changes: 1 addition & 3 deletions solid/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,9 @@
"pdsinterop/flysystem-nextcloud": "^0.2",
"pdsinterop/flysystem-rdf": "^0.6",
"pdsinterop/solid-auth": "^0.12.2",
"pdsinterop/solid-crud": "^0.8",
"psr/log": "^1.1"
"pdsinterop/solid-crud": "^0.8"
},
"require-dev": {
"doctrine/dbal": "*",
"phpunit/phpunit": "^8 || ^9"
}
}
174 changes: 10 additions & 164 deletions solid/composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading