Skip to content

Commit c8e54b8

Browse files
Thomas BrugmanThomas Brugman
authored andcommitted
Trim workflows to remove uneeded error handling and file renaming.
1 parent ca9aea5 commit c8e54b8

File tree

5 files changed

+12
-33
lines changed

5 files changed

+12
-33
lines changed

.github/workflows/build-check.yaml

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,9 @@ jobs:
2929
mkarchiso -v -w workdir/ -o out/ .
3030
"
3131
32-
- name: Rename ISO to Arch.iso
33-
run: |
34-
docker exec arch-container bash -c "
35-
iso_file=\$(ls /workdir/out/*.iso 2>/dev/null | head -n 1) &&
36-
[ -n \"\$iso_file\" ] && mv \$iso_file /workdir/out/Arch.iso || echo 'No ISO file found.'
37-
"
38-
3932
- name: Copy ISO to Host
4033
run: |
41-
docker cp arch-container:/workdir/out/Arch.iso ${{ github.workspace }}/ || echo 'Failed to copy ISO to host.'
34+
docker cp arch-container:/workdir/out/Arch.iso ${{ github.workspace }}/
4235
4336
- name: Get current date
4437
id: date
@@ -90,5 +83,5 @@ jobs:
9083
9184
- name: Clean Up
9285
run: |
93-
docker stop arch-container || echo 'Failed to stop the container.'
94-
docker rm arch-container || echo 'Failed to remove the container.'
86+
docker stop arch-container
87+
docker rm arch-container

.github/workflows/build.yaml

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,29 +19,17 @@ jobs:
1919
2020
- name: Build ISO in Arch Container
2121
run: |
22-
set -e
2322
docker exec arch-container bash -c "
2423
pacman -Syu --noconfirm &&
2524
pacman -S --noconfirm git archiso grub &&
2625
cd /workdir &&
2726
mkarchiso -v -w workdir/ -o out/ .
2827
"
2928
30-
- name: Rename ISO to Arch.iso
31-
run: |
32-
set -e
33-
docker exec arch-container bash -c "
34-
iso_file=\$(ls /workdir/out/*.iso 2>/dev/null | head -n 1) &&
35-
[ -n \"\$iso_file\" ] && mv \$iso_file /workdir/out/Arch.iso || echo 'No ISO file found.'
36-
"
37-
38-
- name: List ISO files
39-
run: |
40-
docker exec arch-container bash -c "ls -l /workdir/out/" || echo 'Failed to list files.'
41-
29+
4230
- name: Copy ISO to Host
4331
run: |
44-
docker cp arch-container:/workdir/out/Arch.iso ${{ github.workspace }}/ || echo 'Failed to copy ISO to host.'
32+
docker cp arch-container:/workdir/out/Arch.iso ${{ github.workspace }}/
4533
4634
- name: Get current date
4735
id: date
@@ -74,5 +62,5 @@ jobs:
7462

7563
- name: Clean Up
7664
run: |
77-
docker stop arch-container || echo 'Failed to stop the container.'
78-
docker rm arch-container || echo 'Failed to remove the container.'
65+
docker stop arch-container
66+
docker rm arch-container

.github/workflows/dockerfile-check.yaml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
branches: [ "main" ]
66
workflow_dispatch:
77
schedule:
8-
# Run the workflow on the 1st of every month at midnight
8+
# Run the workflow every day at midnight
99
- cron: 0 0 * * *
1010

1111
jobs:
@@ -17,7 +17,6 @@ jobs:
1717
uses: actions/checkout@v4
1818

1919
- name: Build and Run Docker container
20-
run: |
21-
set -e # Exit immediately if a command exits with a non-zero status
22-
docker build -t arch-iso-builder . || { echo "Docker build failed"; exit 1; }
23-
docker run --rm --privileged -v "$(pwd)":/workdir arch-iso-builder bash -c "mkarchiso -v -w workdir/ -o out/ ." || { echo "ISO creation failed"; exit 1; }
20+
run:
21+
docker build -t arch-iso-builder .
22+
docker run --rm --privileged -v "$(pwd)":/workdir arch-iso-builder bash -c "mkarchiso -v -w workdir/ -o out/ ."

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
---
32

43
# Arch Linux Without the Beeps

profiledef.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env bash
22
# shellcheck disable=SC2034
33

4-
iso_name="archlinux"
4+
iso_name="Arch"
55
iso_label="ARCH_$(date --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y%m)"
66
iso_publisher="Arch Linux <https://archlinux.org>"
77
iso_application="Arch Linux Live/Rescue DVD"

0 commit comments

Comments
 (0)