From c8e54b8d607c8cf1530c32faf32ffd8dda6686cb Mon Sep 17 00:00:00 2001 From: Thomas Brugman Date: Wed, 27 Nov 2024 17:24:45 +0100 Subject: [PATCH 1/7] Trim workflows to remove uneeded error handling and file renaming. --- .github/workflows/build-check.yaml | 13 +++---------- .github/workflows/build.yaml | 20 ++++---------------- .github/workflows/dockerfile-check.yaml | 9 ++++----- README.md | 1 - profiledef.sh | 2 +- 5 files changed, 12 insertions(+), 33 deletions(-) diff --git a/.github/workflows/build-check.yaml b/.github/workflows/build-check.yaml index c1c9f256e..96385867f 100644 --- a/.github/workflows/build-check.yaml +++ b/.github/workflows/build-check.yaml @@ -29,16 +29,9 @@ jobs: mkarchiso -v -w workdir/ -o out/ . " - - name: Rename ISO to Arch.iso - run: | - docker exec arch-container bash -c " - iso_file=\$(ls /workdir/out/*.iso 2>/dev/null | head -n 1) && - [ -n \"\$iso_file\" ] && mv \$iso_file /workdir/out/Arch.iso || echo 'No ISO file found.' - " - - name: Copy ISO to Host run: | - docker cp arch-container:/workdir/out/Arch.iso ${{ github.workspace }}/ || echo 'Failed to copy ISO to host.' + docker cp arch-container:/workdir/out/Arch.iso ${{ github.workspace }}/ - name: Get current date id: date @@ -90,5 +83,5 @@ jobs: - name: Clean Up run: | - docker stop arch-container || echo 'Failed to stop the container.' - docker rm arch-container || echo 'Failed to remove the container.' + docker stop arch-container + docker rm arch-container diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index da0d8191a..1094c1606 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -19,7 +19,6 @@ jobs: - name: Build ISO in Arch Container run: | - set -e docker exec arch-container bash -c " pacman -Syu --noconfirm && pacman -S --noconfirm git archiso grub && @@ -27,21 +26,10 @@ jobs: mkarchiso -v -w workdir/ -o out/ . " - - name: Rename ISO to Arch.iso - run: | - set -e - docker exec arch-container bash -c " - iso_file=\$(ls /workdir/out/*.iso 2>/dev/null | head -n 1) && - [ -n \"\$iso_file\" ] && mv \$iso_file /workdir/out/Arch.iso || echo 'No ISO file found.' - " - - - name: List ISO files - run: | - docker exec arch-container bash -c "ls -l /workdir/out/" || echo 'Failed to list files.' - + - name: Copy ISO to Host run: | - docker cp arch-container:/workdir/out/Arch.iso ${{ github.workspace }}/ || echo 'Failed to copy ISO to host.' + docker cp arch-container:/workdir/out/Arch.iso ${{ github.workspace }}/ - name: Get current date id: date @@ -74,5 +62,5 @@ jobs: - name: Clean Up run: | - docker stop arch-container || echo 'Failed to stop the container.' - docker rm arch-container || echo 'Failed to remove the container.' + docker stop arch-container + docker rm arch-container diff --git a/.github/workflows/dockerfile-check.yaml b/.github/workflows/dockerfile-check.yaml index ed690462d..22cabe52f 100644 --- a/.github/workflows/dockerfile-check.yaml +++ b/.github/workflows/dockerfile-check.yaml @@ -5,7 +5,7 @@ on: branches: [ "main" ] workflow_dispatch: schedule: - # Run the workflow on the 1st of every month at midnight + # Run the workflow every day at midnight - cron: 0 0 * * * jobs: @@ -17,7 +17,6 @@ jobs: uses: actions/checkout@v4 - name: Build and Run Docker container - run: | - set -e # Exit immediately if a command exits with a non-zero status - docker build -t arch-iso-builder . || { echo "Docker build failed"; exit 1; } - docker run --rm --privileged -v "$(pwd)":/workdir arch-iso-builder bash -c "mkarchiso -v -w workdir/ -o out/ ." || { echo "ISO creation failed"; exit 1; } + run: + docker build -t arch-iso-builder . + docker run --rm --privileged -v "$(pwd)":/workdir arch-iso-builder bash -c "mkarchiso -v -w workdir/ -o out/ ." diff --git a/README.md b/README.md index fa1230892..ee86e493b 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,3 @@ - --- # Arch Linux Without the Beeps diff --git a/profiledef.sh b/profiledef.sh index ce26e793d..6aee89e26 100644 --- a/profiledef.sh +++ b/profiledef.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash # shellcheck disable=SC2034 -iso_name="archlinux" +iso_name="Arch" iso_label="ARCH_$(date --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y%m)" iso_publisher="Arch Linux " iso_application="Arch Linux Live/Rescue DVD" From b7fd8db415d236434b820ab09c2bc16cece866a7 Mon Sep 17 00:00:00 2001 From: Thomas Brugman Date: Wed, 27 Nov 2024 17:29:09 +0100 Subject: [PATCH 2/7] fix typo --- .github/workflows/dockerfile-check.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dockerfile-check.yaml b/.github/workflows/dockerfile-check.yaml index 22cabe52f..30fb2659b 100644 --- a/.github/workflows/dockerfile-check.yaml +++ b/.github/workflows/dockerfile-check.yaml @@ -18,5 +18,5 @@ jobs: - name: Build and Run Docker container run: - docker build -t arch-iso-builder . + docker build -t arch-iso-builder . \ docker run --rm --privileged -v "$(pwd)":/workdir arch-iso-builder bash -c "mkarchiso -v -w workdir/ -o out/ ." From 985c9527cb54e19fe75d1708bee971793326def3 Mon Sep 17 00:00:00 2001 From: Thomas Brugman Date: Wed, 27 Nov 2024 17:32:43 +0100 Subject: [PATCH 3/7] fix typo --- .github/workflows/dockerfile-check.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dockerfile-check.yaml b/.github/workflows/dockerfile-check.yaml index 30fb2659b..22cabe52f 100644 --- a/.github/workflows/dockerfile-check.yaml +++ b/.github/workflows/dockerfile-check.yaml @@ -18,5 +18,5 @@ jobs: - name: Build and Run Docker container run: - docker build -t arch-iso-builder . \ + docker build -t arch-iso-builder . docker run --rm --privileged -v "$(pwd)":/workdir arch-iso-builder bash -c "mkarchiso -v -w workdir/ -o out/ ." From 12fc36a8aa88c76374e3be5a82f565158ebc3f2a Mon Sep 17 00:00:00 2001 From: Thomas Brugman Date: Wed, 27 Nov 2024 17:36:26 +0100 Subject: [PATCH 4/7] typo good now? --- .github/workflows/dockerfile-check.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dockerfile-check.yaml b/.github/workflows/dockerfile-check.yaml index 22cabe52f..fac7550c4 100644 --- a/.github/workflows/dockerfile-check.yaml +++ b/.github/workflows/dockerfile-check.yaml @@ -18,5 +18,5 @@ jobs: - name: Build and Run Docker container run: - docker build -t arch-iso-builder . + docker build -t arch-iso-builder . && \ docker run --rm --privileged -v "$(pwd)":/workdir arch-iso-builder bash -c "mkarchiso -v -w workdir/ -o out/ ." From f74619b10b3e50512b69af8fdaa94846aa898be8 Mon Sep 17 00:00:00 2001 From: Thomas Brugman Date: Wed, 27 Nov 2024 17:39:32 +0100 Subject: [PATCH 5/7] typo good now?Pls --- .github/workflows/dockerfile-check.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/dockerfile-check.yaml b/.github/workflows/dockerfile-check.yaml index fac7550c4..0f4754854 100644 --- a/.github/workflows/dockerfile-check.yaml +++ b/.github/workflows/dockerfile-check.yaml @@ -15,6 +15,12 @@ jobs: steps: - name: Checkout Repository uses: actions/checkout@v4 + + - name: Install Docker + run: | + sudo apt-get update + sudo apt-get install -y docker.io docker-compose + sudo systemctl start docker - name: Build and Run Docker container run: From 997a7cc73682526bdee0edd984d9d3cd1d552de4 Mon Sep 17 00:00:00 2001 From: Thomas Brugman Date: Wed, 27 Nov 2024 17:43:23 +0100 Subject: [PATCH 6/7] typo good now?Pls God --- .github/workflows/dockerfile-check.yaml | 31 +++++++++++++++---------- 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/.github/workflows/dockerfile-check.yaml b/.github/workflows/dockerfile-check.yaml index 0f4754854..913d0369d 100644 --- a/.github/workflows/dockerfile-check.yaml +++ b/.github/workflows/dockerfile-check.yaml @@ -1,28 +1,35 @@ -name: Check to make sure Dockerfile works +name: Check Dockerfile and Build Arch ISO on: pull_request: branches: [ "main" ] workflow_dispatch: schedule: - # Run the workflow every day at midnight - cron: 0 0 * * * jobs: build: - runs-on: ubuntu-latest # Use a standard runner + runs-on: ubuntu-latest steps: - name: Checkout Repository uses: actions/checkout@v4 - - - name: Install Docker + + - name: Ensure Docker is installed run: | - sudo apt-get update - sudo apt-get install -y docker.io docker-compose - sudo systemctl start docker + if ! command -v docker &> /dev/null; then + echo "Docker is not installed. Installing..." + sudo apt-get update + sudo apt-get install -y docker.io + sudo systemctl start docker + sudo systemctl enable docker + fi + docker --version # Check Docker versie - - name: Build and Run Docker container - run: - docker build -t arch-iso-builder . && \ - docker run --rm --privileged -v "$(pwd)":/workdir arch-iso-builder bash -c "mkarchiso -v -w workdir/ -o out/ ." + - name: Build and Run Docker Container + run: | + docker build -t arch-iso-builder . + docker run --rm --privileged \ + -v "${{ github.workspace }}:/workdir" \ + arch-iso-builder \ + bash -c "mkarchiso -v -w workdir/ -o out/ ." From ca52bc47018488832f56654cca3b05dba0b7d8d5 Mon Sep 17 00:00:00 2001 From: Thomas Brugman Date: Fri, 29 Nov 2024 10:22:34 +0100 Subject: [PATCH 7/7] Rm uneeded step. --- .github/workflows/dockerfile-check.yaml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/.github/workflows/dockerfile-check.yaml b/.github/workflows/dockerfile-check.yaml index 913d0369d..443aa2198 100644 --- a/.github/workflows/dockerfile-check.yaml +++ b/.github/workflows/dockerfile-check.yaml @@ -15,16 +15,6 @@ jobs: - name: Checkout Repository uses: actions/checkout@v4 - - name: Ensure Docker is installed - run: | - if ! command -v docker &> /dev/null; then - echo "Docker is not installed. Installing..." - sudo apt-get update - sudo apt-get install -y docker.io - sudo systemctl start docker - sudo systemctl enable docker - fi - docker --version # Check Docker versie - name: Build and Run Docker Container run: |