@@ -17,7 +17,7 @@ concurrency:
1717
1818jobs :
1919 # @TODO: Instead of building the docker image here, take a pre-build image and mount the code (only build when the Dockerfile changes)
20- docker- build-nextcloud :
20+ build-docker -nextcloud :
2121 runs-on : ubuntu-latest
2222 steps :
2323 - uses : actions/checkout@v3
3434 docker build -t "ghcr.io/pdsinterop/solid-nextcloud:latest" .
3535 docker push "ghcr.io/pdsinterop/solid-nextcloud:latest"
3636
37- tests :
37+ solid-testsuite :
3838 strategy :
3939 fail-fast : false
4040 matrix :
4444 - ' solidtestsuite/webid-provider-tests:v2.1.0'
4545
4646 needs :
47- - docker- build-nextcloud
47+ - build-docker -nextcloud
4848
4949 runs-on : ubuntu-latest
5050
@@ -57,20 +57,23 @@ jobs:
5757 username : ${{ github.actor }}
5858 password : ${{ secrets.GITHUB_TOKEN }}
5959
60- - name : Run Solid webid-provider test suite
60+ - name : Pull docker Images
6161 run : |
6262 docker pull michielbdejong/nextcloud-cookie
6363 docker pull ${{ matrix.test }}
6464 docker pull ghcr.io/pdsinterop/solid-nextcloud:latest
6565 docker pull ghcr.io/pdsinterop/php-solid-pubsub-server:latest
6666
67+ - name : Start Docker Containers
68+ run : |
6769 docker network create testnet
6870 docker run -i --network=testnet -d --name 'pubsub' "ghcr.io/pdsinterop/php-solid-pubsub-server:latest"
6971
72+ - name : Run tests - ${{ matrix.test }}
73+ run : |
7074 source ./run-solid-test-suite.sh
71- startSolidNextcloud 'server' "ghcr.io/pdsinterop/solid-nextcloud:latest"
72- startSolidNextcloud 'thirdparty' "ghcr.io/pdsinterop/solid-nextcloud:latest"
73-
75+ startSolidNextcloud 'server' "ghcr.io/pdsinterop/solid-nextcloud:latest" ${{ matrix.test }}
76+ startSolidNextcloud 'thirdparty' "ghcr.io/pdsinterop/solid-nextcloud:latest" ${{ matrix.test }}
7477 docker run -i --rm --network=testnet \
7578 --env COOKIE="$COOKIE_server" \
7679 --env COOKIE_ALICE="$COOKIE_server" \
0 commit comments