From c07234bab84ec010519e413bb3d1451d125a64ab Mon Sep 17 00:00:00 2001
From: mradigen <sppidytg@gmail.com>
Date: Sat, 11 Jan 2025 16:27:57 +0000
Subject: [PATCH] Update branches and try to fix up the workflow

---
 .github/workflows/release.yml | 36 ++++++-----------------------------
 1 file changed, 6 insertions(+), 30 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 76c32451..7a36a515 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -20,51 +20,28 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v3
 
-      - name: Set up Docker image
-        env:
-          IMAGE_NAME: archlinux_sunnyos
-        run: |
-          # Check if the Docker image exists; build if not
-          if [ -z "$(docker images -q $IMAGE_NAME)" ]; then
-            echo "Building Docker image: $IMAGE_NAME"
-            docker build -t $IMAGE_NAME - <<EOF
-            FROM archlinux:latest
-            RUN pacman -Sy --noconfirm archiso base-devel git
-            EOF
-          else
-            echo "Docker image $IMAGE_NAME already exists."
-          fi
-
       - name: Build ISOs for all branches
         env:
-          IMAGE_NAME: archlinux_sunnyos
+          IMAGE_NAME: archlinux:latest
         run: |
           # Define the branches and corresponding desktop environments
-          branches=("sunnyos_gnome" "sunnyos_kde" "sunnyos_xfce")
+          branches=("sunnyos_gnome" "sunnyos_budgie" "lite_gnome")
 
           # Start the Docker container for building
           docker run --rm --privileged \
             -v "$GITHUB_WORKSPACE:/work" \
             -v "/mnt/temp:/tmp" \
             $IMAGE_NAME /bin/bash -c "
+            pacman -Sy --noconfirm archiso
             for branch in ${branches[@]}; do
               echo 'Checking out branch: $branch'
               git checkout $branch
 
-              # Determine the desktop environment based on the branch
-              case $branch in
-                sunnyos_gnome) desktop_env='gnome' ;;
-                sunnyos_kde) desktop_env='kde' ;;
-                sunnyos_xfce) desktop_env='xfce' ;;
-                *) desktop_env='default' ;;
-              esac
-
-              echo 'Building ISO with $desktop_env for branch $branch'
-              pacman -Sy --noconfirm archiso
-              mkarchiso -v -w /tmp/work -o /tmp/out /work/profiles/$desktop_env
+              echo 'Building ISO for branch $branch'
+              mkarchiso -v -w /tmp/work -o /tmp/out /work
 
               # Move the generated ISO to a central location
-              mv /tmp/out/*.iso /mnt/temp/$branch-$desktop_env-sunnyos.iso
+              mv /tmp/out/*.iso /mnt/temp/$branch-sunnyos.iso
             done
           "
 
@@ -73,7 +50,6 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          # Create the release via GitHub API
           release_response=$(curl -XPOST -H "Authorization: token $GITHUB_TOKEN" \
             -d '{
               "tag_name": "'"${{ github.event.inputs.release_version }}"'",