Skip to content

Commit f354341

Browse files
PothercaPotherca
committed
Change ci.yml workflow
- Run docker in non-TTY mode. - Remove pup-sub build (has been added to repo it lives in). - Add authentication.
1 parent 7199ce6 commit f354341

3 files changed

Lines changed: 70 additions & 67 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 59 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
# This workflow will do a clean install of node dependencies, build the source
2-
# code and run tests across different versions of node
3-
# For more information see:
4-
# https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
5-
1+
---
62
name: Solid Test Suites
73

84
on:
@@ -14,90 +10,93 @@ on:
1410
branches: [ main ]
1511

1612
jobs:
17-
docker-build-pub-sub:
18-
runs-on: ubuntu-latest
19-
20-
steps:
21-
- uses: actions/checkout@v3
22-
23-
- name: Build Pub-Sub Docker image
24-
run: |
25-
docker build -t pubsub-server https://github.com/pdsinterop/php-solid-pubsub-server.git#main
26-
docker push ghcr.io/pdsinterop/solid-nextcloud:latest
27-
2813
docker-build-nextcloud:
2914
runs-on: ubuntu-latest
3015
steps:
3116
- uses: actions/checkout@v3
3217

18+
- uses: docker/login-action@v2
19+
with:
20+
registry: ghcr.io
21+
username: ${{ github.actor }}
22+
password: ${{ secrets.GITHUB_TOKEN }}
23+
24+
# @FIXME: In stead of `latest` docker images need to be tagged with the MR/PR reference (or commit hash)
3325
- name: Build Solid-Nextcloud Docker image
3426
run: |
35-
docker build -t solid-nextcloud .
36-
docker push ghcr.io/pdsinterop/php-solid-pubsub-server:latest
27+
docker build -t "ghcr.io/pdsinterop/solid-nextcloud:latest" .
28+
docker push "ghcr.io/pdsinterop/solid-nextcloud:latest"
3729
3830
run-tests:
3931
needs:
4032
- docker-build-nextcloud
41-
- docker-build-pub-sub
4233

4334
runs-on: ubuntu-latest
4435

4536
steps:
4637
- uses: actions/checkout@v3
4738

39+
- uses: docker/login-action@v2
40+
with:
41+
registry: ghcr.io
42+
username: ${{ github.actor }}
43+
password: ${{ secrets.GITHUB_TOKEN }}
44+
4845
- name: Run Solid webid-provider test suite
4946
run: |
5047
docker pull michielbdejong/nextcloud-cookie
5148
docker pull solidtestsuite/webid-provider-tests:v2.1.0
49+
docker pull ghcr.io/pdsinterop/solid-nextcloud:latest
50+
docker pull ghcr.io/pdsinterop/php-solid-pubsub-server:latest
5251
5352
docker network create testnet
54-
docker run --network=testnet -d --name pubsub ghcr.io/pdsinterop/php-solid-pubsub-server:latest
53+
docker run -i --network=testnet -d --name 'pubsub' "ghcr.io/pdsinterop/php-solid-pubsub-server:latest"
5554
5655
source ./run-solid-test-suite.sh
57-
startSolidNextcloud 'server' 'ghcr.io/pdsinterop/solid-nextcloud'
58-
startSolidNextcloud 'thirdparty' 'ghcr.io/pdsinterop/solid-nextcloud'
56+
startSolidNextcloud 'server' "ghcr.io/pdsinterop/solid-nextcloud:latest"
57+
startSolidNextcloud 'thirdparty' "ghcr.io/pdsinterop/solid-nextcloud:latest"
5958
60-
docker run --rm --network=testnet \
59+
docker run -i --rm --network=testnet \
6160
--env COOKIE="$COOKIE_server" \
6261
--env COOKIE_ALICE="$COOKIE_server" \
6362
--env COOKIE_BOB="$COOKIE_thirdparty" \
6463
--env-file ./env-vars-testers.list \
6564
solidtestsuite/webid-provider-tests:v2.1.0
6665
67-
- name: Run Solid solid-crud test suite
68-
run: |
69-
docker pull michielbdejong/nextcloud-cookie
70-
docker pull solidtestsuite/solid-crud-tests:v6.0.0
71-
72-
docker network create testnet
73-
docker run --network=testnet -d --name pubsub ghcr.io/pdsinterop/php-solid-pubsub-server:latest
74-
75-
source ./run-solid-test-suite.sh
76-
startSolidNextcloud 'server' 'ghcr.io/pdsinterop/solid-nextcloud'
77-
startSolidNextcloud 'thirdparty' 'ghcr.io/pdsinterop/solid-nextcloud'
78-
79-
docker run --rm --network=testnet \
80-
--env COOKIE="$COOKIE_server" \
81-
--env COOKIE_ALICE="$COOKIE_server" \
82-
--env COOKIE_BOB="$COOKIE_thirdparty" \
83-
--env-file ./env-vars-testers.list \
84-
solidtestsuite/solid-crud-tests:v6.0.0
85-
86-
- name: Run Solid web-access-control test suite
87-
run: |
88-
docker pull michielbdejong/nextcloud-cookie
89-
docker pull solidtestsuite/web-access-control-tests:v7.1.0
90-
91-
docker network create testnet
92-
docker run --network=testnet -d --name pubsub ghcr.io/pdsinterop/php-solid-pubsub-server:latest
93-
94-
source ./run-solid-test-suite.sh
95-
startSolidNextcloud 'server' 'ghcr.io/pdsinterop/solid-nextcloud'
96-
startSolidNextcloud 'thirdparty' 'ghcr.io/pdsinterop/solid-nextcloud'
97-
98-
docker run --rm --network=testnet \
99-
--env COOKIE="$COOKIE_server" \
100-
--env COOKIE_ALICE="$COOKIE_server" \
101-
--env COOKIE_BOB="$COOKIE_thirdparty" \
102-
--env-file ./env-vars-testers.list \
103-
solidtestsuite/web-access-control-tests:v7.1.0
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

‎Dockerfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ RUN apt-get update && apt-get install -yq \
44
git \
55
sudo \
66
vim \
7+
zip \
78
&& rm -rf /var/lib/apt/lists/* \
89
&& a2enmod ssl \
910
&& mkdir /tls \

‎run-solid-test-suite.sh‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,19 @@
33
set -e
44

55
function setup {
6-
docker network create testnet
7-
docker build -t solid-nextcloud .
86
docker build -t pubsub-server https://github.com/pdsinterop/php-solid-pubsub-server.git#main
7+
docker build -t solid-nextcloud .
8+
9+
docker network create testnet
10+
911
docker pull michielbdejong/nextcloud-cookie
10-
docker pull solidtestsuite/webid-provider-tests:v2.1.0
11-
docker tag solidtestsuite/webid-provider-tests:v2.1.0 webid-provider-tests
1212
docker pull solidtestsuite/solid-crud-tests:v7.0.5
13-
docker tag solidtestsuite/solid-crud-tests:v7.0.5 solid-crud-tests
1413
docker pull solidtestsuite/web-access-control-tests:v7.1.0
14+
docker pull solidtestsuite/webid-provider-tests:v2.1.0
15+
16+
docker tag solidtestsuite/solid-crud-tests:v7.0.5 solid-crud-tests
1517
docker tag solidtestsuite/web-access-control-tests:v7.1.0 web-access-control-tests
18+
docker tag solidtestsuite/webid-provider-tests:v2.1.0 webid-provider-tests
1619
}
1720

1821
function teardown {
@@ -37,8 +40,8 @@ function startSolidNextcloud {
3740

3841
docker logs "$1"
3942
echo "Running init script for Nextcloud $1 ..."
40-
docker exec -u www-data -it -e SERVER_ROOT="https://$1" "$1" sh /init.sh
41-
docker exec -u root -it "$1" service apache2 reload
43+
docker exec -u www-data -i -e SERVER_ROOT="https://$1" "$1" sh /init.sh
44+
docker exec -u root -i "$1" service apache2 reload
4245
echo Getting cookie for "$1"...
4346
export COOKIE_$1="$(docker run --cap-add=SYS_ADMIN --network=testnet --env-file "./env-vars-$1.list" michielbdejong/nextcloud-cookie)"
4447
}

0 commit comments

Comments
 (0)