Skip to content

Commit 855d0d0

Browse files
committed
Change ci.yml to run tests in parallel.
1 parent f354341 commit 855d0d0

1 file changed

Lines changed: 69 additions & 38 deletions

File tree

.github/workflows/ci.yml

Lines changed: 69 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ jobs:
2727
docker build -t "ghcr.io/pdsinterop/solid-nextcloud:latest" .
2828
docker push "ghcr.io/pdsinterop/solid-nextcloud:latest"
2929
30-
run-tests:
30+
# @TODO: Instead of duplicating this code 3 times, use a matrix?
31+
test-webid-provider:
3132
needs:
3233
- docker-build-nextcloud
3334

@@ -63,40 +64,70 @@ jobs:
6364
--env-file ./env-vars-testers.list \
6465
solidtestsuite/webid-provider-tests:v2.1.0
6566
66-
# - name: Run Solid solid-crud test suite
67-
# run: |
68-
# docker pull michielbdejong/nextcloud-cookie
69-
# docker pull solidtestsuite/solid-crud-tests:v6.0.0
70-
#
71-
# docker network create testnet
72-
# docker run -i --network=testnet -d --name pubsub ghcr.io/pdsinterop/php-solid-pubsub-server:latest
73-
#
74-
# source ./run-solid-test-suite.sh
75-
# startSolidNextcloud 'server' "ghcr.io/pdsinterop/solid-nextcloud:latest"
76-
# startSolidNextcloud 'thirdparty' "ghcr.io/pdsinterop/solid-nextcloud:latest"
77-
#
78-
# docker run -i --rm --network=testnet \
79-
# --env COOKIE="$COOKIE_server" \
80-
# --env COOKIE_ALICE="$COOKIE_server" \
81-
# --env COOKIE_BOB="$COOKIE_thirdparty" \
82-
# --env-file ./env-vars-testers.list \
83-
# solidtestsuite/solid-crud-tests:v6.0.0
84-
#
85-
# - name: Run Solid web-access-control test suite
86-
# run: |
87-
# docker pull michielbdejong/nextcloud-cookie
88-
# docker pull solidtestsuite/web-access-control-tests:v7.1.0
89-
#
90-
# docker network create testnet
91-
# docker run -i --network=testnet -d --name 'pubsub' "ghcr.io/pdsinterop/php-solid-pubsub-server:latest"
92-
#
93-
# source ./run-solid-test-suite.sh
94-
# startSolidNextcloud 'server' "ghcr.io/pdsinterop/solid-nextcloud:latest"
95-
# startSolidNextcloud 'thirdparty' "ghcr.io/pdsinterop/solid-nextcloud:latest"
96-
#
97-
# docker run -i --rm --network=testnet \
98-
# --env COOKIE="$COOKIE_server" \
99-
# --env COOKIE_ALICE="$COOKIE_server" \
100-
# --env COOKIE_BOB="$COOKIE_thirdparty" \
101-
# --env-file ./env-vars-testers.list \
102-
# solidtestsuite/web-access-control-tests:v7.1.0
67+
test-solid-crud:
68+
needs:
69+
- docker-build-nextcloud
70+
71+
runs-on: ubuntu-latest
72+
73+
steps:
74+
- uses: actions/checkout@v3
75+
76+
- uses: docker/login-action@v2
77+
with:
78+
registry: ghcr.io
79+
username: ${{ github.actor }}
80+
password: ${{ secrets.GITHUB_TOKEN }}
81+
82+
- name: Run Solid solid-crud test suite
83+
run: |
84+
docker pull michielbdejong/nextcloud-cookie
85+
docker pull solidtestsuite/solid-crud-tests:v6.0.0
86+
87+
docker network create testnet
88+
docker run -i --network=testnet -d --name pubsub ghcr.io/pdsinterop/php-solid-pubsub-server:latest
89+
90+
source ./run-solid-test-suite.sh
91+
startSolidNextcloud 'server' "ghcr.io/pdsinterop/solid-nextcloud:latest"
92+
startSolidNextcloud 'thirdparty' "ghcr.io/pdsinterop/solid-nextcloud:latest"
93+
94+
docker run -i --rm --network=testnet \
95+
--env COOKIE="$COOKIE_server" \
96+
--env COOKIE_ALICE="$COOKIE_server" \
97+
--env COOKIE_BOB="$COOKIE_thirdparty" \
98+
--env-file ./env-vars-testers.list \
99+
solidtestsuite/solid-crud-tests:v6.0.0
100+
101+
test-web-access-control:
102+
needs:
103+
- docker-build-nextcloud
104+
105+
runs-on: ubuntu-latest
106+
107+
steps:
108+
- uses: actions/checkout@v3
109+
110+
- uses: docker/login-action@v2
111+
with:
112+
registry: ghcr.io
113+
username: ${{ github.actor }}
114+
password: ${{ secrets.GITHUB_TOKEN }}
115+
116+
- name: Run Solid web-access-control test suite
117+
run: |
118+
docker pull michielbdejong/nextcloud-cookie
119+
docker pull solidtestsuite/web-access-control-tests:v7.1.0
120+
121+
docker network create testnet
122+
docker run -i --network=testnet -d --name 'pubsub' "ghcr.io/pdsinterop/php-solid-pubsub-server:latest"
123+
124+
source ./run-solid-test-suite.sh
125+
startSolidNextcloud 'server' "ghcr.io/pdsinterop/solid-nextcloud:latest"
126+
startSolidNextcloud 'thirdparty' "ghcr.io/pdsinterop/solid-nextcloud:latest"
127+
128+
docker run -i --rm --network=testnet \
129+
--env COOKIE="$COOKIE_server" \
130+
--env COOKIE_ALICE="$COOKIE_server" \
131+
--env COOKIE_BOB="$COOKIE_thirdparty" \
132+
--env-file ./env-vars-testers.list \
133+
solidtestsuite/web-access-control-tests:v7.1.0

0 commit comments

Comments
 (0)