Skip to content
This repository was archived by the owner on Sep 1, 2022. It is now read-only.

Commit 7391fc4

Browse files
author
Sam Lanning
authored
Merge pull request #4 from github/update-ci
Update CI to build codeql-learninglab-check too
2 parents 912be8e + 1a42bf8 commit 7391fc4

31 files changed

+9
-633
lines changed

courses/cpp/ctf-segv/image/.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
/event.json
1+
/tmp

courses/cpp/ctf-segv/image/test.sh

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,22 @@ set -e
66
set -x
77

88
TMP=$PWD/tmp
9+
# Extract the expected parent tag from course Dockerfile
10+
PARENT_TAG=$(head -n 1 Dockerfile | awk -F ' ' '{print $2}')
911
TAG=ci-test
1012

11-
docker login docker.pkg.github.com -u github-actions -p ${GITHUB_TOKEN}
13+
# Build codeql-learninglab-check
14+
docker build -t $PARENT_TAG ../../../../codeql-learninglab-check
1215

16+
# Build course image
1317
docker build -t $TAG .
1418

15-
19+
# Prepare temporary folder to mount into docker
1620
mkdir -p $TMP
1721
cp -R ../answers $TMP/answers
22+
echo "{}" > $TMP/event.json
1823

19-
# Create event file
20-
cat <<EOT > tmp/event.json
21-
{
22-
}
23-
EOT
24-
24+
# Run docker image
2525
docker run -i \
2626
-e GITHUB_EVENT_NAME=push \
2727
-e GITHUB_EVENT_PATH=/opt/tmp/event.json \

courses/cpp/ctf-segv/image/tmp/answers/01_function_definitions.ql

Lines changed: 0 additions & 11 deletions
This file was deleted.

courses/cpp/ctf-segv/image/tmp/answers/02_alloca_definition.ql

Lines changed: 0 additions & 12 deletions
This file was deleted.

courses/cpp/ctf-segv/image/tmp/answers/03_alloca.ql

Lines changed: 0 additions & 12 deletions
This file was deleted.

courses/cpp/ctf-segv/image/tmp/answers/04_alloca_ignore_small.ql

Lines changed: 0 additions & 16 deletions
This file was deleted.

courses/cpp/ctf-segv/image/tmp/answers/05_use_alloca.ql

Lines changed: 0 additions & 13 deletions
This file was deleted.

courses/cpp/ctf-segv/image/tmp/answers/06_use_alloca_guard.ql

Lines changed: 0 additions & 15 deletions
This file was deleted.

courses/cpp/ctf-segv/image/tmp/answers/07_use_alloca_guard.ql

Lines changed: 0 additions & 19 deletions
This file was deleted.

courses/cpp/ctf-segv/image/tmp/answers/08_use_alloca_guard.ql

Lines changed: 0 additions & 25 deletions
This file was deleted.

0 commit comments

Comments
 (0)