Skip to content
Merged

Ci 4 #23

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions .github/workflows/ci-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -32,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' '-'`
Expand All @@ -40,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 }}
Expand Down
12 changes: 2 additions & 10 deletions ci_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
./utilities/bin/makelist -s source -o TheList
# Let's build the TheList
./utilities/bin/makelist --cicd -s source -o TheList

9 changes: 9 additions & 0 deletions ci_build_tools.sh
Original file line number Diff line number Diff line change
@@ -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
)