Merge pull request #6 from github/script-changes

Script changes

Author: Sam Lanning

.github/workflows/ci.yml

@@ -3,14 +3,22 @@ name: CI
 on: [push]
 
 jobs:
-  # TODO: make this use any changes in codeql-learninglab-check
-  test-courses-cpp-ctf-segv:
+  test-courses-cpp-ctf-segv-actual:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v1
+
+    - name: Login to docker
+      run: docker login docker.pkg.github.com -u github-actions -p ${{ secrets.GITHUB_TOKEN }}
+
+    - name: Build Images & Run Queries
+      run: cd courses/cpp/ctf-segv && ../../../scripts/test-course-actual.sh
+  test-courses-cpp-ctf-segv-latest:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
       uses: actions/checkout@v1
 
     - name: Build Images & Run Queries
-      run: cd courses/cpp/ctf-segv && ../../../scripts/test-course.sh
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      run: cd courses/cpp/ctf-segv && ../../../scripts/test-course-latest.sh

scripts/test-course-actual.sh

@@ -0,0 +1,19 @@
+#! /bin/bash
+
+# Build the codeql-learninglab-check & course image, and run all queries in
+# the course to ensure the expected result
+#
+# Should be run with the cwd being the course folder
+
+set -e
+set -x
+
+# Extract the expected parent tag from course Dockerfile
+PARENT_TAG=$(head -n 1 image/Dockerfile | awk -F ' ' '{print $2}')
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+
+# Build codeql-learninglab-check
+docker pull $PARENT_TAG
+
+# Run ./test-course-shared.sh
+$DIR/test-course-shared.sh

scripts/test-course-latest.sh

@@ -0,0 +1,19 @@
+#! /bin/bash
+
+# Build the codeql-learninglab-check & course image, and run all queries in
+# the course to ensure the expected result
+#
+# Should be run with the cwd being the course folder
+
+set -e
+set -x
+
+# Extract the expected parent tag from course Dockerfile
+PARENT_TAG=$(head -n 1 image/Dockerfile | awk -F ' ' '{print $2}')
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+
+# Build codeql-learninglab-check
+docker build -t $PARENT_TAG $DIR/../codeql-learninglab-check
+
+# Run ./test-course-shared.sh
+$DIR/test-course-shared.sh

scripts/test-course.sh scripts/test-course-shared.shscripts/test-course.sh renamed to scripts/test-course-shared.sh

@@ -1,6 +1,6 @@
 #! /bin/bash
 
-# Build the codeql-learninglab-check & course image, and run all queries in
+# Build the course image, and run all queries in
 # the course to ensure the expected result
 #
 # Should be run with the cwd being the course folder
@@ -9,13 +9,8 @@ set -e
 set -x
 
 TMP=$(mktemp -d -t ci-XXXXXXXXXX)
-# Extract the expected parent tag from course Dockerfile
-PARENT_TAG=$(head -n 1 image/Dockerfile | awk -F ' ' '{print $2}')
 TAG=ci-test
 
-# Build codeql-learninglab-check
-docker build -t $PARENT_TAG ../../../codeql-learninglab-check
-
 # Build course image
 docker build -t $TAG image