From a95ecbe08df57ab47d5b12855a7cd1555b1a1c53 Mon Sep 17 00:00:00 2001
From: Gertjan van den Burg <gertjanvandenburg@gmail.com>
Date: Tue, 26 Jan 2021 18:23:44 +0000
Subject: Move docker build to separate action

---
 .github/workflows/action.yml |  5 +++++
 .github/workflows/build.yml  | 18 +++++++-----------
 2 files changed, 12 insertions(+), 11 deletions(-)
 create mode 100644 .github/workflows/action.yml

(limited to '.github')

diff --git a/.github/workflows/action.yml b/.github/workflows/action.yml
new file mode 100644
index 00000000..7110d442
--- /dev/null
+++ b/.github/workflows/action.yml
@@ -0,0 +1,5 @@
+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 0acc1f26..ebcd846b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -10,19 +10,15 @@ jobs:
   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: Build TCPDBench docker image
-        run: docker build -t alan-turing-institute/tcpdbench .
-
-      - name: Create output directory
-        run: mkdir -p docker_output
-
-      - name: Recreate output and test for differences
-        run: docker -v docker_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"
-
-      - name: Show output
-        run: ls -R docker_output
+      - name: TCPDBench docker check
+        uses: ./.github/workflows/
+        with:
+          entrypoint: "make clean && make results && git checkout ./analysis/output/rankplots/*.pdf && git diff --exit-code"
-- 
cgit v1.2.3