From 5b74172dc254219ded77a673e9de93d8c0f147de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Volkert=20de=20Buisonj=C3=A9?= Date: Sun, 21 Jan 2024 14:03:15 +0100 Subject: [PATCH] Run only the `Build project` (compile) step in a `debian-djgpp` container --- .github/workflows/01-build-and-release.yml | 10 +++------- .github/workflows/02-pr-checks.yml | 1 + scripts/build-in-container.sh | 5 +++++ 3 files changed, 9 insertions(+), 7 deletions(-) create mode 100755 scripts/build-in-container.sh diff --git a/.github/workflows/01-build-and-release.yml b/.github/workflows/01-build-and-release.yml index 7a1092c0..c630544e 100644 --- a/.github/workflows/01-build-and-release.yml +++ b/.github/workflows/01-build-and-release.yml @@ -11,19 +11,15 @@ permissions: jobs: release-job: runs-on: ubuntu-latest - container: - image: ghcr.io/volkertb/debian-djgpp:v0.3 steps: - name: Checkout repository uses: actions/checkout@v3 with: path: src - name: Build project - run: | - cd $GITHUB_WORKSPACE/src - test -f main.c - make CC=gcc CXX=g++ - test -f output/sbemu.exe + uses: docker://ghcr.io/volkertb/debian-djgpp:v0.2 + with: + entrypoint: src/scripts/build-in-container.sh - name: Build FreeDOS SBEMU USB image run: | $GITHUB_WORKSPACE/src/scripts/build-release-artifacts.sh $GITHUB_WORKSPACE/src/output/sbemu.exe $GITHUB_WORKSPACE/ diff --git a/.github/workflows/02-pr-checks.yml b/.github/workflows/02-pr-checks.yml index 66e9809a..e36ea23f 100644 --- a/.github/workflows/02-pr-checks.yml +++ b/.github/workflows/02-pr-checks.yml @@ -11,6 +11,7 @@ jobs: uses: actions/checkout@v3 - name: shellcheck shell scripts run: | + shellcheck scripts/build-in-container.sh shellcheck scripts/build-release-artifacts.sh shellcheck test/run_cicd_dos.sh build: diff --git a/scripts/build-in-container.sh b/scripts/build-in-container.sh new file mode 100755 index 00000000..bf2b69c5 --- /dev/null +++ b/scripts/build-in-container.sh @@ -0,0 +1,5 @@ +#!/bin/sh +cd src || exit 1 +test -f main.c +make CC=gcc CXX=g++ +test -f output/sbemu.exe