From 3e179a6a2b9d66ab4bf066bf1a0d0dc1d6a2084c Mon Sep 17 00:00:00 2001 From: Andrew Bird Date: Sat, 4 Apr 2026 09:27:16 +0100 Subject: [PATCH 1/3] CI: Move makelist build to separate step --- .github/workflows/ci-build.yml | 3 +++ ci_build.sh | 10 +--------- ci_build_tools.sh | 9 +++++++++ 3 files changed, 13 insertions(+), 9 deletions(-) create mode 100755 ci_build_tools.sh diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 005d28f35..7b495a90e 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -24,6 +24,9 @@ jobs: - name: Package install run: ./ci_prereq.sh + - name: Build Tools + run: ./ci_build_tools.sh + - name: Build run: ./ci_build.sh diff --git a/ci_build.sh b/ci_build.sh index 13970203a..4ef4b4222 100755 --- a/ci_build.sh +++ b/ci_build.sh @@ -2,14 +2,6 @@ set -e -# Let's build makelist ourselves as we want to be sure that it's the latest -(cd utilities - [ -f bin/makelist ] && mv bin/makelist bin/makelist.repo - fpc -obin/makelist makelist/makelist.lpr -) - -echo - -# Now let's build the TheList +# Let's build the TheList ./utilities/bin/makelist -s source -o TheList diff --git a/ci_build_tools.sh b/ci_build_tools.sh new file mode 100755 index 000000000..af0c885d4 --- /dev/null +++ b/ci_build_tools.sh @@ -0,0 +1,9 @@ +#!/bin/sh + +set -e + +# Let's build makelist ourselves as we want to be sure that it's the latest +(cd utilities + [ -f bin/makelist ] && mv bin/makelist bin/makelist.repo + fpc -obin/makelist makelist/makelist.lpr +) From 58872cc4cd717f85ae5d890bd2085fe04c98f9e7 Mon Sep 17 00:00:00 2001 From: Andrew Bird Date: Sat, 4 Apr 2026 09:30:26 +0100 Subject: [PATCH 2/3] CI: Add validation switch to makelist --- ci_build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci_build.sh b/ci_build.sh index 4ef4b4222..d7f85ddd0 100755 --- a/ci_build.sh +++ b/ci_build.sh @@ -3,5 +3,5 @@ set -e # Let's build the TheList -./utilities/bin/makelist -s source -o TheList +./utilities/bin/makelist --cicd -s source -o TheList From f92b9320d90f8717d4aca0c6f33e3a05cb9de1f3 Mon Sep 17 00:00:00 2001 From: Andrew Bird Date: Sat, 4 Apr 2026 09:33:37 +0100 Subject: [PATCH 3/3] CI: Consolidate complex step condition to one step --- .github/workflows/ci-build.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 7b495a90e..8bcd76dda 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -35,6 +35,9 @@ jobs: # - name: Make snapshot name id: snapshotname + if: github.repository == 'LoopZ/TheList' && + github.ref_type != 'tag' && + (github.event_name == 'push' || github.event.pull_request.merged == true) run: | ( today=`date -u +%F | tr '\n' '-'` @@ -43,9 +46,7 @@ jobs: ) - name: Upload - if: github.repository == 'LoopZ/TheList' && - github.ref_type != 'tag' && - (github.event_name == 'push' || github.event.pull_request.merged == true) + if: steps.snapshotname.outputs.fname uses: actions/upload-artifact@v6 with: name: ${{ steps.snapshotname.outputs.fname }}