diff --git a/.github/workflows/solid-tests-suites.yml b/.github/workflows/solid-tests-suites.yml index 895d0fb4..b4e130f7 100644 --- a/.github/workflows/solid-tests-suites.yml +++ b/.github/workflows/solid-tests-suites.yml @@ -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 @@ -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 @@ -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 }}" @@ -152,3 +151,4 @@ jobs: --env COOKIE_BOB="$COOKIE_thirdparty" \ --env-file ./env-vars-testers.list \ ${{ matrix.test }} + diff --git a/solid/appinfo/info.xml b/solid/appinfo/info.xml index ae64a0ff..86c0ea28 100644 --- a/solid/appinfo/info.xml +++ b/solid/appinfo/info.xml @@ -18,7 +18,7 @@ When you do this, the Solid App can store data in your Nextcloud account through integration https://github.com/pdsinterop/solid-nextcloud/issues - + OCA\Solid\Settings\SolidAdmin diff --git a/solid/composer.json b/solid/composer.json index 349c3cdc..1d85f9f7 100644 --- a/solid/composer.json +++ b/solid/composer.json @@ -33,7 +33,7 @@ "pdsinterop/flysystem-rdf": "^0.6", "pdsinterop/solid-auth": "^0.12.2", "pdsinterop/solid-crud": "^0.8", - "psr/log": "^1.1" + "psr/log": "^3.0" }, "require-dev": { "doctrine/dbal": "*", diff --git a/solid/composer.lock b/solid/composer.lock index 23eec227..568e5524 100644 --- a/solid/composer.lock +++ b/solid/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "a5c29aca1210cdfafb93daaada201232", + "content-hash": "1ecc7c22c83c7870543e9be45c1e341f", "packages": [ { "name": "arc/base", @@ -1972,30 +1972,30 @@ }, { "name": "psr/log", - "version": "1.1.4", + "version": "3.0.2", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "d49695b909c3b7628b6289db5479a1c204601f11" + "reference": "f16e1d5863e37f8d8c2a01719f5b34baa2b714d3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11", - "reference": "d49695b909c3b7628b6289db5479a1c204601f11", + "url": "https://api.github.com/repos/php-fig/log/zipball/f16e1d5863e37f8d8c2a01719f5b34baa2b714d3", + "reference": "f16e1d5863e37f8d8c2a01719f5b34baa2b714d3", "shasum": "" }, "require": { - "php": ">=5.3.0" + "php": ">=8.0.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1.x-dev" + "dev-master": "3.x-dev" } }, "autoload": { "psr-4": { - "Psr\\Log\\": "Psr/Log/" + "Psr\\Log\\": "src" } }, "notification-url": "https://packagist.org/downloads/", @@ -2016,9 +2016,9 @@ "psr-3" ], "support": { - "source": "https://github.com/php-fig/log/tree/1.1.4" + "source": "https://github.com/php-fig/log/tree/3.0.2" }, - "time": "2021-05-03T11:20:27+00:00" + "time": "2024-09-11T13:17:53+00:00" }, { "name": "ralouphie/getallheaders",