Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,16 @@ jobs:

steps:
- uses: actions/checkout@v2
# extract branch name
- if: github.event_name == 'pull_request'
run: echo "BRANCH_NAME=${GITHUB_HEAD_REF}" >> $GITHUB_ENV
- if: github.event_name != 'pull_request'
run: echo "BRANCH_NAME=${GITHUB_REF#refs/heads/}" >> $GITHUB_ENV

# print branch name
- name: Get branch name
run: echo 'The branch name is' $BRANCH_NAME

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
Expand All @@ -34,4 +44,4 @@ jobs:
- run: npm pack .
- run: npm install -g solid-server-*.tgz
# Run the Solid test-suite
- run: bash test/surface/run-solid-test-suite.sh
- run: bash test/surface/run-solid-test-suite.sh $BRANCH_NAME
5 changes: 4 additions & 1 deletion test/surface/docker/server/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
FROM node:latest
ARG BRANCH=main
RUN echo Testing branch ${BRANCH} of NSS
RUN git clone https://github.com/solid/node-solid-server
WORKDIR node-solid-server
RUN git checkout main
RUN git checkout ${BRANCH}
RUN git status
RUN npm install
RUN openssl req -new -x509 -days 365 -nodes \
-out ./server.cert \
Expand Down
7 changes: 5 additions & 2 deletions test/surface/run-solid-test-suite.sh
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
#!/bin/bash
set -e


function setup {
echo Branch name: $1
docker network create testnet
docker build -t server test/surface/docker/server
docker build -t server --build-arg BRANCH=$1 test/surface/docker/server
docker build -t cookie test/surface/docker/cookie
docker run -d --env-file test/surface/server-env.list --name server --network=testnet -v `pwd`:/travis -w /node-solid-server server /travis/bin/solid-test start --config-file /node-solid-server/config.json
docker run -d --env-file test/surface/thirdparty-env.list --name thirdparty --network=testnet -v `pwd`/test/surface:/surface server /node-solid-server/bin/solid-test start --config-file /surface/thirdparty-config.json
Expand Down Expand Up @@ -42,7 +44,7 @@ function runTests {

# ...
teardown || true
setup
setup $1
waitForNss server
runTests webid-provider-tests v2.0.3
runTests solid-crud-tests nss-skips
Expand All @@ -59,3 +61,4 @@ teardown
# --env COOKIE_BOB="$COOKIE_thirdparty" \
# --env-file test/surface/web-access-control-tests-env.list \
# solidtestsuite/web-access-control-tests:latest /bin/bash