@@ -37,23 +37,23 @@ jobs:
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='${{ 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 }}'" \
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
0 commit comments