Skip to content

Commit 85d6020

Browse files
PothercaPotherca
committed
Fix various incorrect definitions.
1 parent 5bc5825 commit 85d6020

File tree

1 file changed

+31
-30
lines changed

1 file changed

+31
-30
lines changed

‎.github/workflows/solid-tests-suites.yml‎

Lines changed: 31 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -25,35 +25,35 @@ jobs:
2525
docker-images:
2626
outputs:
2727
COOKIE_IMAGE: ${{ steps.images.outputs.COOKIE_IMAGE}}
28-
COOKIE_KEY: ${{ steps.keys.outputs.COOKIE_KEY }}'"
28+
COOKIE_KEY: ${{ steps.keys.outputs.COOKIE_KEY }}
2929
PUBSUB_IMAGE: ${{ steps.images.outputs.PUBSUB_IMAGE }}
30-
PUBSUB_KEY: ${{ steps.keys.outputs.PUBSUB_KEY }}'"
30+
PUBSUB_KEY: ${{ steps.keys.outputs.PUBSUB_KEY }}
3131
SOLID_CRUD_TESTS_IMAGE: ${{steps.images.outputs.SOLID_CRUD_TESTS_IMAGE}}
32-
SOLID_CRUD_TESTS_KEY: ${{ steps.keys.outputs.SOLID_CRUD_TESTS_KEY }}'"
32+
SOLID_CRUD_TESTS_KEY: ${{ steps.keys.outputs.SOLID_CRUD_TESTS_KEY }}
3333
WEB_ACCESS_CONTROL_TESTS_IMAGE: ${{steps.images.outputs.WEB_ACCESS_CONTROL_TESTS_IMAGE}}
34-
WEB_ACCESS_CONTROL_TESTS_KEY: ${{ steps.keys.outputs.WEB_ACCESS_CONTROL_TESTS_KEY }}'"
34+
WEB_ACCESS_CONTROL_TESTS_KEY: ${{ steps.keys.outputs.WEB_ACCESS_CONTROL_TESTS_KEY }}
3535
WEBID_PROVIDER_TESTS_IMAGE: ${{steps.images.outputs.WEBID_PROVIDER_TESTS_IMAGE}}
36-
WEBID_PROVIDER_TESTS_KEY: ${{ steps.keys.outputs.WEBID_PROVIDER_TESTS_KEY }}'"
36+
WEBID_PROVIDER_TESTS_KEY: ${{ steps.keys.outputs.WEBID_PROVIDER_TESTS_KEY }}
3737
runs-on: ubuntu-latest
3838
steps:
3939
- id: images
40-
run: >-
41-
echo "COOKIE_IMAGE='michielbdejong/nextcloud-cookie:${{ env.COOKIE_TAG }}'" >> "${GITHUB_OUTPUT}";
42-
echo "PUBSUB_IMAGE='ghcr.io/pdsinterop/php-solid-pubsub-server:${{ env.PUBSUB_TAG }}'" >> "${GITHUB_OUTPUT}";
43-
echo "SOLID_CRUD_TESTS_IMAGE='solidtestsuite/solid-crud-tests:v7.0.5'" >> "${GITHUB_OUTPUT}";
44-
echo "WEB_ACCESS_CONTROL_TESTS_IMAGE='solidtestsuite/web-access-control-tests:v7.1.0'" >> "${GITHUB_OUTPUT}";
45-
echo "WEBID_PROVIDER_TESTS_IMAGE='solidtestsuite/webid-provider-tests:v2.1.1'" >> "${GITHUB_OUTPUT}";
40+
run: |
41+
echo "COOKIE_IMAGE='michielbdejong/nextcloud-cookie:${{ env.COOKIE_TAG }}'" >> "${GITHUB_OUTPUT}"
42+
echo "PUBSUB_IMAGE='ghcr.io/pdsinterop/php-solid-pubsub-server:${{ env.PUBSUB_TAG }}'" >> "${GITHUB_OUTPUT}"
43+
echo "SOLID_CRUD_TESTS_IMAGE='solidtestsuite/solid-crud-tests:v7.0.5'" >> "${GITHUB_OUTPUT}"
44+
echo "WEB_ACCESS_CONTROL_TESTS_IMAGE='solidtestsuite/web-access-control-tests:v7.1.0'" >> "${GITHUB_OUTPUT}"
45+
echo "WEBID_PROVIDER_TESTS_IMAGE='solidtestsuite/webid-provider-tests:v2.1.1'" >> "${GITHUB_OUTPUT}"
4646
- id: keys
47-
run: >-
48-
echo "COOKIE_KEY='${{ steps.outputs.COOKIE_IMAGE }}'"
49-
| tr --complement --squeeze-repeats '[:alnum:]._-' '_')" >> "${GITHUB_OUTPUT}";
50-
echo "PUBSUB_KEY='${{ steps.outputs.PUBSUB_IMAGE }}'"
51-
| tr --complement --squeeze-repeats '[:alnum:]._-' '_')" >> "${GITHUB_OUTPUT}";
52-
echo "SOLID_CRUD_TESTS_KEY='${{ steps.outputs.SOLID_CRUD_TESTS_IMAGE }}'"
53-
| tr --complement --squeeze-repeats '[:alnum:]._-' '_')" >> "${GITHUB_OUTPUT}";
54-
echo "WEB_ACCESS_CONTROL_TESTS_KEY='${{ steps.outputs.WEB_ACCESS_CONTROL_TESTS_IMAGE }}'"
55-
| tr --complement --squeeze-repeats '[:alnum:]._-' '_')" >> "${GITHUB_OUTPUT}";
56-
echo "WEBID_PROVIDER_TESTS_KEY='${{ steps.outputs.WEBID_PROVIDER_TESTS_IMAGE }}'"
47+
run: |
48+
echo "COOKIE_KEY=$(echo "${{ steps.images.outputs.COOKIE_IMAGE }}" \
49+
| tr --complement --squeeze-repeats '[:alnum:]._-' '_')" >> "${GITHUB_OUTPUT}"
50+
echo "PUBSUB_KEY=$(echo "${{ steps.images.outputs.PUBSUB_IMAGE }}" \
51+
| tr --complement --squeeze-repeats '[:alnum:]._-' '_')" >> "${GITHUB_OUTPUT}"
52+
echo "SOLID_CRUD_TESTS_KEY=$(echo "${{ steps.images.outputs.SOLID_CRUD_TESTS_IMAGE }}" \
53+
| tr --complement --squeeze-repeats '[:alnum:]._-' '_')" >> "${GITHUB_OUTPUT}"
54+
echo "WEB_ACCESS_CONTROL_TESTS_KEY=$(echo "${{ steps.images.outputs.WEB_ACCESS_CONTROL_TESTS_IMAGE }}" \
55+
| tr --complement --squeeze-repeats '[:alnum:]._-' '_')" >> "${GITHUB_OUTPUT}"
56+
echo "WEBID_PROVIDER_TESTS_KEY=$(echo "${{ steps.images.outputs.WEBID_PROVIDER_TESTS_IMAGE }}" \
5757
| tr --complement --squeeze-repeats '[:alnum:]._-' '_')" >> "${GITHUB_OUTPUT}";
5858
5959
# @TODO: Instead of building the docker image here, take a pre-build image and mount the code?
@@ -103,7 +103,9 @@ jobs:
103103
.
104104
docker push "ghcr.io/${{ github.repository }}:${{ env.TAG }}"
105105
mkdir -p cache/solid-nextcloud
106-
docker image save solid-nextcloud:${{ env.TAG }} --output ./cache/solid-nextcloud/${{ github.sha }}-${{ matrix.nextcloud_version }}.tar
106+
docker image save solid-nextcloud:${{ env.TAG }} \
107+
--output ./cache/solid-nextcloud/${{ github.sha }}-${{ matrix.nextcloud_version }}.tar
108+
107109
108110
pull-docker-cookie:
109111
needs: docker-images
@@ -203,9 +205,9 @@ jobs:
203205
- 29
204206
- 30
205207
test:
206-
- 'solidtestsuite/solid-crud-tests:v7.0.5'
207-
- 'solidtestsuite/web-access-control-tests:v7.1.0'
208-
- 'solidtestsuite/webid-provider-tests:v2.1.1'
208+
- ${{ needs.docker-images.outputs.SOLID_CRUD_TESTS_KEY }}
209+
- ${{ needs.docker-images.outputs.WEB_ACCESS_CONTROL_TESTS_KEY }}
210+
- ${{ needs.docker-images.outputs.WEBID_PROVIDER_TESTS_KEY }}
209211

210212
# Prevent EOL or non-stable versions of Nextcloud to fail the test-suite
211213
continue-on-error: ${{ contains(fromJson('[28,29,30]'), matrix.nextcloud_version) == false }}
@@ -215,8 +217,7 @@ jobs:
215217
# A tag name may only contain lower- and uppercase letters, digits, underscores, periods and dashes.
216218
run: |
217219
echo "TAG=$(echo -n "${{ github.ref_name }}-${{ matrix.nextcloud_version }}" \
218-
| tr --complement --squeeze-repeats '[:alnum:]._-' '_')" \
219-
>> "${GITHUB_ENV}"
220+
| tr --complement --squeeze-repeats '[:alnum:]._-' '_')" >> "${GITHUB_ENV}"
220221
221222
- uses: actions/checkout@v4
222223

@@ -236,9 +237,9 @@ jobs:
236237
- name: Load docker Images
237238
run: |
238239
docker image load --input ./cache/solid-nextcloud/${{ github.sha }}-${{ matrix.nextcloud_version }}.tar
239-
docker image load --input ./cache/${{ needs.docker-images.outputs.COOKIE_IMAGE }}.tar
240+
docker image load --input ./cache/${{ needs.docker-images.outputs.COOKIE_KEY }}.tar
240241
docker image load --input ./cache/${{ matrix.test }}.tar
241-
docker image load --input ./cache/${{ needs.docker-images.outputs.PUBSUB_TAG }}.tar
242+
docker image load --input ./cache/${{ needs.docker-images.outputs.PUBSUB_KEY }}.tar
242243
243244
- name: Start Docker Containers
244245
run: |
@@ -248,7 +249,7 @@ jobs:
248249
--interactive \
249250
--name 'pubsub' \
250251
--network=testnet \
251-
"ghcr.io/pdsinterop/php-solid-pubsub-server:${{ env.PUBSUB_TAG }}"
252+
${{ needs.docker-images.outputs.PUBSUB_IMAGE }}
252253
253254
source ./run-solid-test-suite.sh
254255
startSolidNextcloud 'server' "solid-nextcloud:${{ env.TAG }}" ${{ matrix.test }}

0 commit comments

Comments
 (0)