Enhance GitHub Actions workflows for Arch Linux builds:

- Remove unnecessary Docker Buildx setup and caching steps.
- Add environment variable for workspace and create cache directories.
- Improve container initialization and package installation with error handling.
- Update ISO build process to include detailed logging and verification.
- Refactor checksum generation and artifact naming for clarity.
- Streamline cleanup process and ensure build logs are uploaded on failure.

Author: Githubguy132010

.github/workflows/build.yaml

@@ -25,25 +25,20 @@ jobs:
       - name: Checkout Repository
         uses: actions/checkout@v4
 
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-        with:
-          buildkitd-flags: --debug
-
-      - name: Cache Docker layers
-        uses: actions/cache@v3
-        with:
-          path: /tmp/.buildx-cache
-          key: ${{ runner.os }}-buildx-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-buildx-
-
       - name: Set up environment variables
         id: env
         run: |
           echo "DATE=$(date +'%Y-%m-%d')" >> $GITHUB_ENV
           echo "VERSION=$(date +'%Y.%m.%d')" >> $GITHUB_ENV
           echo "CACHE_KEY=$(date +'%Y-%m')" >> $GITHUB_ENV
+          echo "WORKSPACE=${GITHUB_WORKSPACE}" >> $GITHUB_ENV
+
+      - name: Create Cache Directories
+        run: |
+          sudo mkdir -p /tmp/pacman-cache
+          sudo chmod 777 /tmp/pacman-cache
+          sudo mkdir -p /tmp/build-cache
+          sudo chmod 777 /tmp/build-cache
 
       - name: Cache Pacman packages
         uses: actions/cache@v3
@@ -55,18 +50,36 @@ jobs:
 
       - name: Set up Arch Linux Container
         run: |
-          mkdir -p /tmp/pacman-cache
           docker run --privileged --name arch-container -d \
-            -v ${{ github.workspace }}:/workdir \
+            -v ${{ env.WORKSPACE }}:/workdir \
             -v /tmp/pacman-cache:/var/cache/pacman/pkg \
+            -v /tmp/build-cache:/var/cache/pacman/pkg \
             archlinux:latest sleep infinity
 
-      - name: Update and Install Dependencies
+      - name: Initialize Container
         run: |
           docker exec arch-container bash -c "
             set -euo pipefail
+            
+            # Update package database
             pacman -Sy --noconfirm
-            pacman -S --noconfirm --needed git archiso grub curl jq gnupg
+            
+            # Install required packages
+            pacman -S --noconfirm --needed \
+              git \
+              archiso \
+              grub \
+              curl \
+              jq \
+              gnupg \
+              make \
+              sudo
+            
+            # Verify installation
+            command -v mkarchiso >/dev/null 2>&1 || {
+              echo 'Error: mkarchiso not found'
+              exit 1
+            }
           "
 
       - name: Build ISO
@@ -75,29 +88,49 @@ jobs:
           docker exec arch-container bash -c "
             set -euo pipefail
             cd /workdir
+            
             # Cleanup any previous builds
             rm -rf workdir/ out/
+            mkdir -p out/
+            
             # Build the ISO with verbose output
-            mkarchiso -v -w workdir/ -o out/ . || {
-              echo 'ISO build failed!'
+            mkarchiso -v -w workdir/ -o out/ . 2>&1 | tee build.log || {
+              echo 'Error: ISO build failed!'
+              tail -n 50 build.log
+              exit 1
+            }
+            
+            # Verify ISO was created
+            [ -f out/*.iso ] || {
+              echo 'Error: ISO file not found after build'
               exit 1
             }
           "
 
       - name: Generate Checksums
         run: |
           docker exec arch-container bash -c "
+            set -euo pipefail
             cd /workdir/out
-            sha256sum *.iso > sha256sums.txt
-            sha512sum *.iso > sha512sums.txt
+            
+            # Generate checksums
+            for iso in *.iso; do
+              sha256sum \"\$iso\" > \"\${iso}.sha256sum\"
+              sha512sum \"\$iso\" > \"\${iso}.sha512sum\"
+            done
           "
 
       - name: Rename and Move ISO
         run: |
           docker exec arch-container bash -c "
+            set -euo pipefail
             cd /workdir/out
+            
             for f in *.iso; do
-              mv \"\$f\" \"arch-linux-no-beeps-${{ env.VERSION }}.iso\"
+              newname=\"arch-linux-no-beeps-${{ env.VERSION }}.iso\"
+              mv \"\$f\" \"\$newname\"
+              mv \"\$f.sha256sum\" \"\$newname.sha256sum\"
+              mv \"\$f.sha512sum\" \"\$newname.sha512sum\"
             done
           "
 
@@ -106,8 +139,8 @@ jobs:
         with:
           name: arch-linux-no-beeps-${{ env.VERSION }}
           path: |
-            ${{ github.workspace }}/out/*.iso
-            ${{ github.workspace }}/out/sha*sums.txt
+            ${{ env.WORKSPACE }}/out/*.iso
+            ${{ env.WORKSPACE }}/out/*.sha*sum
           retention-days: 5
 
       - name: Create Release
@@ -133,17 +166,21 @@ jobs:
           draft: false
           prerelease: false
           files: |
-            ${{ github.workspace }}/out/*.iso
-            ${{ github.workspace }}/out/sha*sums.txt
+            ${{ env.WORKSPACE }}/out/*.iso
+            ${{ env.WORKSPACE }}/out/*.sha*sum
 
       - name: Clean Up
         if: always()
         run: |
           docker stop arch-container || true
           docker rm arch-container || true
-          rm -rf workdir/ out/
+          sudo rm -rf workdir/ out/ /tmp/build-cache/*
 
-      - name: Notify on Failure
+      - name: Upload Build Logs on Failure
         if: failure()
-        run: |
-          echo "::error::ISO build failed! Check the logs for more details."
+        uses: actions/upload-artifact@v3
+        with:
+          name: build-logs
+          path: |
+            ${{ env.WORKSPACE }}/build.log
+          retention-days: 5

.github/workflows/update-packages.yaml

@@ -20,43 +20,53 @@ jobs:
 
       - name: Set up Docker
         run: |
-          docker run --name arch-container -d archlinux:latest sleep infinity
+          docker run --name arch-container -d \
+            -v ${{ github.workspace }}:/workdir \
+            archlinux:latest sleep infinity
+
+      - name: Initialize Container
+        run: |
+          docker exec arch-container bash -c "
+            pacman -Sy --noconfirm
+            pacman -S --noconfirm --needed curl jq
+          "
 
       - name: Check for Package Updates
         id: check-updates
         run: |
-          # Create temporary files
-          touch new-packages.txt current-packages.txt updates.txt
+          # Create temporary files in workspace
+          touch current-packages.txt updates.txt
           
           # Get current packages
-          cat packages.x86_64 | grep -v '^#' | grep -v '^$' > current-packages.txt
+          grep -v '^#' packages.x86_64 | grep -v '^$' > current-packages.txt
           
           # Check each package for updates
           docker exec arch-container bash -c "
+            set -euo pipefail
+            cd /workdir
+            
+            # Initialize pacman
             pacman -Sy
+            
+            # Process each package
             while read -r pkg; do
-              if pacman -Si \$pkg >/dev/null 2>&1; then
-                echo \$pkg >> /tmp/new-packages.txt
+              if pacman -Si \"\$pkg\" >/dev/null 2>&1; then
+                current_ver=\$(pacman -Si \"\$pkg\" | grep Version | head -n1 | awk '{print \$3}')
+                echo \"\$pkg \$current_ver\" >> updates.txt
+              else
+                echo \"Warning: Package \$pkg not found in repositories\"
               fi
-            done < /workdir/current-packages.txt
+            done < current-packages.txt
           "
           
-          # Compare versions and create update list
-          docker exec arch-container bash -c "
-            while read -r pkg; do
-              current_ver=\$(pacman -Si \$pkg | grep Version | head -n1 | awk '{print \$3}')
-              echo \"\$pkg \$current_ver\" >> /tmp/updates.txt
-            done < /tmp/new-packages.txt
-          "
-          
-          # Copy files back
-          docker cp arch-container:/tmp/updates.txt .
-          
-          # Set output
+          # Check if we have updates
           if [ -s updates.txt ]; then
             echo "updates_available=true" >> $GITHUB_OUTPUT
+            echo "Found updates:"
+            cat updates.txt
           else
             echo "updates_available=false" >> $GITHUB_OUTPUT
+            echo "No updates found"
           fi
 
       - name: Create Pull Request
@@ -87,4 +97,4 @@ jobs:
         run: |
           docker stop arch-container || true
           docker rm arch-container || true
-          rm -f updates.txt new-packages.txt current-packages.txt
+          rm -f current-packages.txt updates.txt