diff options
| author | Gertjan van den Burg <gertjanvandenburg@gmail.com> | 2021-01-26 18:43:07 +0000 |
|---|---|---|
| committer | Gertjan van den Burg <gertjanvandenburg@gmail.com> | 2021-01-26 18:43:07 +0000 |
| commit | deb6d8f7d59663c0ad5f86f6a31b8208eaa5465e (patch) | |
| tree | 12be9f9f0d65806864469afe58eaedfd4a30c9d1 | |
| parent | Add result check via git (diff) | |
| download | TCPDBench-deb6d8f7d59663c0ad5f86f6a31b8208eaa5465e.tar.gz TCPDBench-deb6d8f7d59663c0ad5f86f6a31b8208eaa5465e.zip | |
second attempt at running docker checks
| -rwxr-xr-x | .github/scripts/test_docker.sh | 19 | ||||
| -rw-r--r-- | .github/workflows/action.yml | 5 | ||||
| -rw-r--r-- | .github/workflows/build.yml | 29 |
3 files changed, 33 insertions, 20 deletions
diff --git a/.github/scripts/test_docker.sh b/.github/scripts/test_docker.sh new file mode 100755 index 00000000..8a2132e5 --- /dev/null +++ b/.github/scripts/test_docker.sh @@ -0,0 +1,19 @@ +#!/bin/bash +# +# Test TCPDBench build using Docker +# +# Author: G.J.J. van den Burg +# Date: 2021-01-26 +# + +set -e -u -x -o pipefail + +echo "Building docker image" + +docker build -t alan-turing-institute/tcpdbench . + +mkdir -p ${GITHUB_WORKSPACE}/analysis/output + +docker run -v ${GITHUB_WORKSPACE}/analysis/output:/TCPDBench/analysis/output \ + alan-turing-institute/tcpdbench \ + /bin/bash -c "make clean && make results && git checkout ./analysis/output/rankplots/*.pdf && git diff --exit-code" diff --git a/.github/workflows/action.yml b/.github/workflows/action.yml deleted file mode 100644 index 7110d442..00000000 --- a/.github/workflows/action.yml +++ /dev/null @@ -1,5 +0,0 @@ -name: TCPDBench Docker -description: Runs the TCPDBench checks using Docker -runs: - using: docker - image: ../../Dockerfile diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1d5eb0c9..3abb7b27 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -38,18 +38,17 @@ jobs: run: git checkout ./analysis/output/rankplots/*.pdf && git diff --exit-code shell: bash - # tcpdbench-docker: - # name: Check TCPDBench (docker) - # runs-on: ubuntu-latest - # container: - # volumes: - # - ./analysis/output:/TCPDBench/analysis/output - # - # steps: - # - name: Checkout - # uses: actions/checkout@v2 - # - # - name: TCPDBench docker check - # uses: ./.github/workflows/ - # with: - # entrypoint: "make clean && make results && git checkout ./analysis/output/rankplots/*.pdf && git diff --exit-code" + tcpdbench-docker: + name: Check TCPDBench (docker) + runs-on: ubuntu-latest + container: + volumes: + - ./analysis/output:/TCPDBench/analysis/output + + steps: + - name: Checkout + uses: actions/checkout@v2 + + - name: TCPDBench docker check + run: ./.github/scripts/test_docker.sh + shell: bash |