From af4958b6bbff57e5013922374739aeb25d629301 Mon Sep 17 00:00:00 2001
From: Ducky <ducky@sodalite.rocks>
Date: Mon, 20 Mar 2023 03:52:55 +0000
Subject: [PATCH 01/26] =?UTF-8?q?=F0=9F=90=9E=20build:=20fix=20--ex-print-?=
 =?UTF-8?q?github-release-table-row=20not=20working=20with=20--container?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build.sh b/build.sh
index cb3c56c..7c02339 100755
--- a/build.sh
+++ b/build.sh
@@ -470,6 +470,7 @@ function main() {
             [[ $ex_ntfy_password != "" ]] && container_build_args+=" --ex-ntfy-password $ex_ntfy_password"
             [[ $ex_ntfy_topic != "" ]] && container_build_args+=" --ex-ntfy-topic $ex_ntfy_topic"
             [[ $ex_ntfy_username != "" ]] && container_build_args+=" --ex-ntfy-username $ex_ntfy_username"
+            [[ $ex_print_github_release_table_row != "" ]] && container_build_args+=" --ex-print-github-release-table-row $ex_print_github_release_table_row"
             [[ $skip_cleanup != "" ]] && container_build_args+=" --skip-cleanup $skip_cleanup"
             [[ $skip_test != "" ]] && container_build_args+=" --skip-test $skip_test"
             [[ $tree != "" ]] && container_build_args+=" --tree $tree"

From d2b89b9c09b2f164cf4b4be30f0a13331cd5d5e9 Mon Sep 17 00:00:00 2001
From: Ducky <ducky@sodalite.rocks>
Date: Tue, 21 Mar 2023 18:46:23 +0000
Subject: [PATCH 02/26] =?UTF-8?q?=F0=9F=A7=B9=20ci:=20add=20tag=20fetching?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .ci.sh                   | 5 +++++
 .github/workflows/ci.yml | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/.ci.sh b/.ci.sh
index 378ae89..0765979 100755
--- a/.ci.sh
+++ b/.ci.sh
@@ -35,6 +35,10 @@ function step_checkout_branch() {
     git checkout $branch
 }
 
+function step_fetch_tags() {
+    git fetch --tags origin
+}
+
 function step_update_submodules() {
     git submodule sync
     git submodule update --init --recursive
@@ -51,6 +55,7 @@ shift
 case $step in
     "build-tree") step_build_tree $1 $2 ;;
     "checkout-branch") step_checkout_branch $1 $2 ;;
+    "fetch-tags") step_fetch_tags ;;
     "test-environment") step_test_environment ;;
     "update-submodules") step_update_submodules ;;
     *)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 570739c..358c475 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -20,6 +20,9 @@ jobs:
       - name: Test environment
         run: ./.ci.sh test-environment
 
+      - name: Fetch tags
+        run: ./.ci.sh fetch-tags
+
       - name: Checkout branch
         if: ${{ inputs.branch != '' }}
         run: ./.ci.sh checkout-branch ${{ inputs.branch }}

From acb6497eb2f509899646e40455596975e08eb3cf Mon Sep 17 00:00:00 2001
From: Ducky <ducky@sodalite.rocks>
Date: Tue, 21 Mar 2023 20:50:49 +0000
Subject: [PATCH 03/26] =?UTF-8?q?=F0=9F=A7=B9=20ci:=20remove=20ci.sh=20scr?=
 =?UTF-8?q?ipt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .ci.sh                                 | 63 --------------------------
 .github/workflows/ci.yml               | 40 +++++++++++-----
 .github/workflows/update-manual.yml    |  1 -
 .github/workflows/update-scheduled.yml |  7 ---
 4 files changed, 28 insertions(+), 83 deletions(-)
 delete mode 100755 .ci.sh

diff --git a/.ci.sh b/.ci.sh
deleted file mode 100755
index 0765979..0000000
--- a/.ci.sh
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/bash
-
-step="$1"
-
-function die() {
-    echo "Error: $1"
-    exit 255
-}
-
-function step_build_tree() {
-    tree="$1"
-    ostree_repo="$2"
-
-    container_hostname="$(hostname -f)"
-    container_image="fedora:37"
-    start_time="$(date +%s)"
-
-    ./build.sh \
-        --container \
-        --tree "$tree" \
-        --vendor "sodaliterocks" \
-        --working-dir "$ostree_repo" \
-        --ex-container-hostname "$container_hostname" \
-        --ex-container-image "$container_image" \
-        --ex-override-starttime "$start_time" \
-        --ex-print-github-release-table-row
-
-    if [[ $? != 0 ]]; then
-        die "Failed to build"
-    fi
-}
-
-function step_checkout_branch() {
-    branch="$1"
-    git checkout $branch
-}
-
-function step_fetch_tags() {
-    git fetch --tags origin
-}
-
-function step_update_submodules() {
-    git submodule sync
-    git submodule update --init --recursive
-}
-
-function step_test_environment() {
-    if [[ $(id -u) != 0 ]]; then
-        die "Unauthorized (are you root?)"
-    fi
-}
-
-shift
-
-case $step in
-    "build-tree") step_build_tree $1 $2 ;;
-    "checkout-branch") step_checkout_branch $1 $2 ;;
-    "fetch-tags") step_fetch_tags ;;
-    "test-environment") step_test_environment ;;
-    "update-submodules") step_update_submodules ;;
-    *)
-        die "Step '$step' does not exist"
-esac
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 358c475..7f8f4d4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -5,8 +5,6 @@ on:
     inputs:
       branch:
         type: string
-      repo:
-        type: string
       tree:
         required: true
         type: string
@@ -17,18 +15,36 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - name: Test environment
-        run: ./.ci.sh test-environment
-
-      - name: Fetch tags
-        run: ./.ci.sh fetch-tags
+      - name: Check permissions
+        run: |
+          if [[ $(id -u) != 0 ]]; then
+            echo "Unauthorized (are you root?)"
+            exit 255
+          fi
+        shell: bash
 
-      - name: Checkout branch
+      - name: Checkout alternate branch
         if: ${{ inputs.branch != '' }}
-        run: ./.ci.sh checkout-branch ${{ inputs.branch }}
+        run: |
+          git checkout ${{ inputs.branch }}
+        shell: bash
 
-      - name: Update submodules
-        run: ./.ci.sh update-submodules
+      - name: Prepare codebase
+        run: |
+          git fetch --tags origin
+          git submodule sync
+          git submodule update --init --recursive
+        shell: bash
 
       - name: Build tree
-        run: ./.ci.sh build-tree ${{ inputs.tree }} ${{ inputs.repo }}
+        run: |
+          ./build.sh \
+            --container \
+            --tree "${{ inputs.tree }}" \
+            --vendor "sodaliterocks" \
+            --working-dir "/srv/store/variable/ostree" \
+            --ex-container-hostname "$(hostname -f)" \
+            --ex-container-image "fedora:37" \
+            --ex-override-starttime "$(date +%s)" \
+            --ex-print-github-release-table-row
+        shell: bash
diff --git a/.github/workflows/update-manual.yml b/.github/workflows/update-manual.yml
index d8bc2f5..3e59321 100644
--- a/.github/workflows/update-manual.yml
+++ b/.github/workflows/update-manual.yml
@@ -20,5 +20,4 @@ jobs:
     name: Update (Manual)
     uses: sodaliterocks/sodalite/.github/workflows/ci.yml@main
     with:
-      repo: /srv/store/variable/ostree
       tree: ${{ inputs.tree }}
diff --git a/.github/workflows/update-scheduled.yml b/.github/workflows/update-scheduled.yml
index 7eb0c78..85cf132 100644
--- a/.github/workflows/update-scheduled.yml
+++ b/.github/workflows/update-scheduled.yml
@@ -11,7 +11,6 @@ jobs:
     uses: sodaliterocks/sodalite/.github/workflows/ci.yml@main
     with:
       branch: release/current
-      repo: /srv/store/variable/ostree
       tree: desktop
 
   desktop--long-4:
@@ -19,7 +18,6 @@ jobs:
     uses: sodaliterocks/sodalite/.github/workflows/ci.yml@main
     with:
       branch: release/long/4
-      repo: /srv/store/variable/ostree
       tree: desktop
 
   desktop--next:
@@ -27,7 +25,6 @@ jobs:
     uses: sodaliterocks/sodalite/.github/workflows/ci.yml@main
     with:
       branch: release/next
-      repo: /srv/store/variable/ostree
       tree: desktop
 
   desktop--devel:
@@ -35,7 +32,6 @@ jobs:
     uses: sodaliterocks/sodalite/.github/workflows/ci.yml@main
     with:
       branch: main
-      repo: /srv/store/variable/ostree
       tree: desktop
 
   desktop-budgie--devel:
@@ -43,7 +39,6 @@ jobs:
     uses: sodaliterocks/sodalite/.github/workflows/ci.yml@main
     with:
       branch: main
-      repo: /srv/store/variable/ostree
       tree: desktop-budgie
 
   desktop-deepin--devel:
@@ -51,7 +46,6 @@ jobs:
     uses: sodaliterocks/sodalite/.github/workflows/ci.yml@main
     with:
       branch: main
-      repo: /srv/store/variable/ostree
       tree: desktop-deepin
 
   desktop-gnome--devel:
@@ -59,5 +53,4 @@ jobs:
     uses: sodaliterocks/sodalite/.github/workflows/ci.yml@main
     with:
       branch: main
-      repo: /srv/store/variable/ostree
       tree: desktop-gnome

From bda9d9f47ea289a1663ba9a2d3f715827fcd705b Mon Sep 17 00:00:00 2001
From: Ducky <ducky@sodalite.rocks>
Date: Tue, 21 Mar 2023 20:51:40 +0000
Subject: [PATCH 04/26] =?UTF-8?q?=F0=9F=A7=B9=20update-manual:=20remove=20?=
 =?UTF-8?q?prototyping=20option?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/update-manual.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/update-manual.yml b/.github/workflows/update-manual.yml
index 3e59321..b722f9e 100644
--- a/.github/workflows/update-manual.yml
+++ b/.github/workflows/update-manual.yml
@@ -13,7 +13,6 @@ on:
         - desktop-budgie
         - desktop-deepin
         - desktop-gnome
-        - derp
 
 jobs:
   custom:

From 64a476666f5e4d907e3143af4a78689c5c598b7c Mon Sep 17 00:00:00 2001
From: Ducky <ducky@sodalite.rocks>
Date: Tue, 11 Apr 2023 19:06:00 +0100
Subject: [PATCH 05/26] =?UTF-8?q?=F0=9F=93=A6=20various=20changes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/{update-manual.yml => update.manual.yml} | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
 rename .github/workflows/{update-manual.yml => update.manual.yml} (91%)

diff --git a/.github/workflows/update-manual.yml b/.github/workflows/update.manual.yml
similarity index 91%
rename from .github/workflows/update-manual.yml
rename to .github/workflows/update.manual.yml
index b722f9e..b99bb02 100644
--- a/.github/workflows/update-manual.yml
+++ b/.github/workflows/update.manual.yml
@@ -15,8 +15,7 @@ on:
         - desktop-gnome
 
 jobs:
-  custom:
-    name: Update (Manual)
+  ci:
     uses: sodaliterocks/sodalite/.github/workflows/ci.yml@main
     with:
       tree: ${{ inputs.tree }}

From eb7029e85b9c2e80465983da510c9bdd3b6879b9 Mon Sep 17 00:00:00 2001
From: Ducky <ducky@sodalite.rocks>
Date: Tue, 11 Apr 2023 19:15:29 +0100
Subject: [PATCH 06/26] =?UTF-8?q?=F0=9F=93=A6=20various=20changes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/ci.yml               | 21 +++++-----
 .github/workflows/update-scheduled.yml | 56 --------------------------
 .github/workflows/update.manual.yml    |  8 ++--
 3 files changed, 14 insertions(+), 71 deletions(-)
 delete mode 100644 .github/workflows/update-scheduled.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7f8f4d4..bec41b6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,18 +1,15 @@
 name: CI
 
-on:
-  workflow_call:
-    inputs:
-      branch:
-        type: string
-      tree:
-        required: true
-        type: string
+inputs:
+  branch:
+    type: string
+  tree:
+    required: true
+    type: string
 
-jobs:
-  ci:
-    runs-on: self-hosted
-    steps:
+runs:
+  using: "composite"
+  steps:
       - uses: actions/checkout@v3
 
       - name: Check permissions
diff --git a/.github/workflows/update-scheduled.yml b/.github/workflows/update-scheduled.yml
deleted file mode 100644
index 85cf132..0000000
--- a/.github/workflows/update-scheduled.yml
+++ /dev/null
@@ -1,56 +0,0 @@
-name: Update (Scheduled)
-
-on:
-  schedule:
-    - cron: '0 4 * * 3,6'
-  workflow_dispatch:
-
-jobs:
-  desktop:
-    name: "Update: Desktop (Current)"
-    uses: sodaliterocks/sodalite/.github/workflows/ci.yml@main
-    with:
-      branch: release/current
-      tree: desktop
-
-  desktop--long-4:
-    name: "Update: Desktop (Long 4)"
-    uses: sodaliterocks/sodalite/.github/workflows/ci.yml@main
-    with:
-      branch: release/long/4
-      tree: desktop
-
-  desktop--next:
-    name: "Update: Desktop (Next)"
-    uses: sodaliterocks/sodalite/.github/workflows/ci.yml@main
-    with:
-      branch: release/next
-      tree: desktop
-
-  desktop--devel:
-    name: "Update: Desktop (Devel)"
-    uses: sodaliterocks/sodalite/.github/workflows/ci.yml@main
-    with:
-      branch: main
-      tree: desktop
-
-  desktop-budgie--devel:
-    name: "Update: Budgie (Devel)"
-    uses: sodaliterocks/sodalite/.github/workflows/ci.yml@main
-    with:
-      branch: main
-      tree: desktop-budgie
-
-  desktop-deepin--devel:
-    name: "Update: Deepin (Devel)"
-    uses: sodaliterocks/sodalite/.github/workflows/ci.yml@main
-    with:
-      branch: main
-      tree: desktop-deepin
-
-  desktop-gnome--devel:
-    name: "Update: GNOME (Devel)"
-    uses: sodaliterocks/sodalite/.github/workflows/ci.yml@main
-    with:
-      branch: main
-      tree: desktop-gnome
diff --git a/.github/workflows/update.manual.yml b/.github/workflows/update.manual.yml
index b99bb02..a191a2b 100644
--- a/.github/workflows/update.manual.yml
+++ b/.github/workflows/update.manual.yml
@@ -16,6 +16,8 @@ on:
 
 jobs:
   ci:
-    uses: sodaliterocks/sodalite/.github/workflows/ci.yml@main
-    with:
-      tree: ${{ inputs.tree }}
+    runs-on: self-hosted
+    steps:
+      - uses: sodaliterocks/sodalite/.github/workflows/ci.yml@main
+        with:
+          tree: ${{ inputs.tree }}

From db3e2e39c6e743c4aae05a719d84c882765efe0f Mon Sep 17 00:00:00 2001
From: Ducky <ducky@sodalite.rocks>
Date: Tue, 11 Apr 2023 19:18:49 +0100
Subject: [PATCH 07/26] =?UTF-8?q?=F0=9F=93=A6=20various=20changes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/ci.yml            | 2 --
 .github/workflows/update.manual.yml | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index bec41b6..66501d9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -10,8 +10,6 @@ inputs:
 runs:
   using: "composite"
   steps:
-      - uses: actions/checkout@v3
-
       - name: Check permissions
         run: |
           if [[ $(id -u) != 0 ]]; then
diff --git a/.github/workflows/update.manual.yml b/.github/workflows/update.manual.yml
index a191a2b..7b8c921 100644
--- a/.github/workflows/update.manual.yml
+++ b/.github/workflows/update.manual.yml
@@ -18,6 +18,7 @@ jobs:
   ci:
     runs-on: self-hosted
     steps:
+      - uses: actions/checkout@v3
       - uses: sodaliterocks/sodalite/.github/workflows/ci.yml@main
         with:
           tree: ${{ inputs.tree }}

From 2333ef71146f022c33c9752a51e21a104799bfa9 Mon Sep 17 00:00:00 2001
From: Ducky <ducky@sodalite.rocks>
Date: Tue, 11 Apr 2023 19:27:54 +0100
Subject: [PATCH 08/26] =?UTF-8?q?=F0=9F=93=A6=20various=20changes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/{workflows/ci.yml => actions/ci/action.yml} | 0
 .github/workflows/update.manual.yml                 | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename .github/{workflows/ci.yml => actions/ci/action.yml} (100%)

diff --git a/.github/workflows/ci.yml b/.github/actions/ci/action.yml
similarity index 100%
rename from .github/workflows/ci.yml
rename to .github/actions/ci/action.yml
diff --git a/.github/workflows/update.manual.yml b/.github/workflows/update.manual.yml
index 7b8c921..8bc3d6a 100644
--- a/.github/workflows/update.manual.yml
+++ b/.github/workflows/update.manual.yml
@@ -19,6 +19,6 @@ jobs:
     runs-on: self-hosted
     steps:
       - uses: actions/checkout@v3
-      - uses: sodaliterocks/sodalite/.github/workflows/ci.yml@main
+      - uses: actions/ci@main
         with:
           tree: ${{ inputs.tree }}

From 1ff48472af28f0c763a6d2b0833014ccf399f6e3 Mon Sep 17 00:00:00 2001
From: Ducky <ducky@sodalite.rocks>
Date: Tue, 11 Apr 2023 19:29:49 +0100
Subject: [PATCH 09/26] =?UTF-8?q?=F0=9F=93=A6=20various=20changes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/update.manual.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/update.manual.yml b/.github/workflows/update.manual.yml
index 8bc3d6a..2a0fae6 100644
--- a/.github/workflows/update.manual.yml
+++ b/.github/workflows/update.manual.yml
@@ -19,6 +19,6 @@ jobs:
     runs-on: self-hosted
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/ci@main
+      - uses: ./.github/actions/ci
         with:
           tree: ${{ inputs.tree }}

From 954566c6a2b4d87d816ce0f9364e613dce77336b Mon Sep 17 00:00:00 2001
From: Ducky <ducky@sodalite.rocks>
Date: Tue, 11 Apr 2023 19:39:05 +0100
Subject: [PATCH 10/26] =?UTF-8?q?=F0=9F=93=A6=20various=20changes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/actions/build/action.yml    | 19 ++++++++++++
 .github/actions/ci/action.yml       | 45 -----------------------------
 .github/actions/prepare/action.yml  | 18 ++++++++++++
 .github/workflows/update.manual.yml |  3 +-
 4 files changed, 39 insertions(+), 46 deletions(-)
 create mode 100644 .github/actions/build/action.yml
 delete mode 100644 .github/actions/ci/action.yml
 create mode 100644 .github/actions/prepare/action.yml

diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml
new file mode 100644
index 0000000..ec3e811
--- /dev/null
+++ b/.github/actions/build/action.yml
@@ -0,0 +1,19 @@
+name: Build
+inputs:
+  tree:
+    required: true
+    type: string
+runs:
+  using: "composite"
+  steps:
+      - run: |
+          ./build.sh \
+            --container \
+            --tree "${{ inputs.tree }}" \
+            --vendor "sodaliterocks" \
+            --working-dir "/srv/store/variable/ostree" \
+            --ex-container-hostname "$(hostname -f)" \
+            --ex-container-image "fedora:37" \
+            --ex-override-starttime "$(date +%s)" \
+            --ex-print-github-release-table-row
+        shell: bash
diff --git a/.github/actions/ci/action.yml b/.github/actions/ci/action.yml
deleted file mode 100644
index 66501d9..0000000
--- a/.github/actions/ci/action.yml
+++ /dev/null
@@ -1,45 +0,0 @@
-name: CI
-
-inputs:
-  branch:
-    type: string
-  tree:
-    required: true
-    type: string
-
-runs:
-  using: "composite"
-  steps:
-      - name: Check permissions
-        run: |
-          if [[ $(id -u) != 0 ]]; then
-            echo "Unauthorized (are you root?)"
-            exit 255
-          fi
-        shell: bash
-
-      - name: Checkout alternate branch
-        if: ${{ inputs.branch != '' }}
-        run: |
-          git checkout ${{ inputs.branch }}
-        shell: bash
-
-      - name: Prepare codebase
-        run: |
-          git fetch --tags origin
-          git submodule sync
-          git submodule update --init --recursive
-        shell: bash
-
-      - name: Build tree
-        run: |
-          ./build.sh \
-            --container \
-            --tree "${{ inputs.tree }}" \
-            --vendor "sodaliterocks" \
-            --working-dir "/srv/store/variable/ostree" \
-            --ex-container-hostname "$(hostname -f)" \
-            --ex-container-image "fedora:37" \
-            --ex-override-starttime "$(date +%s)" \
-            --ex-print-github-release-table-row
-        shell: bash
diff --git a/.github/actions/prepare/action.yml b/.github/actions/prepare/action.yml
new file mode 100644
index 0000000..a745f13
--- /dev/null
+++ b/.github/actions/prepare/action.yml
@@ -0,0 +1,18 @@
+name: Prepare
+inputs:
+  branch:
+    type: string
+runs:
+  using: "composite"
+  steps:
+      - run: [[ $(id -u) != 0 ]] && exit 255
+        shell: bash
+      - if: ${{ inputs.branch != '' }}
+        run: git checkout ${{ inputs.branch }}
+        shell: bash
+      - run: git fetch --tags origin
+        shell: bash
+      - run: git submodule sync
+        shell: bash
+      - run: git submodule update --init --recursive
+        shell: bash
diff --git a/.github/workflows/update.manual.yml b/.github/workflows/update.manual.yml
index 2a0fae6..748e600 100644
--- a/.github/workflows/update.manual.yml
+++ b/.github/workflows/update.manual.yml
@@ -19,6 +19,7 @@ jobs:
     runs-on: self-hosted
     steps:
       - uses: actions/checkout@v3
-      - uses: ./.github/actions/ci
+      - uses: ./.github/actions/prepare
+      - uses: ./.github/actions/build
         with:
           tree: ${{ inputs.tree }}

From c61b0452d4f74ce5a33160a94edc2b5b68cb4c36 Mon Sep 17 00:00:00 2001
From: Ducky <ducky@sodalite.rocks>
Date: Tue, 11 Apr 2023 19:40:19 +0100
Subject: [PATCH 11/26] =?UTF-8?q?=F0=9F=93=A6=20various=20changes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/actions/prepare/action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/actions/prepare/action.yml b/.github/actions/prepare/action.yml
index a745f13..083c85a 100644
--- a/.github/actions/prepare/action.yml
+++ b/.github/actions/prepare/action.yml
@@ -5,7 +5,7 @@ inputs:
 runs:
   using: "composite"
   steps:
-      - run: [[ $(id -u) != 0 ]] && exit 255
+      - run: "[[ $(id -u) != 0 ]] && exit 255"
         shell: bash
       - if: ${{ inputs.branch != '' }}
         run: git checkout ${{ inputs.branch }}

From 308cba8f2a36c06b9f1242a210d00867b82f9563 Mon Sep 17 00:00:00 2001
From: Ducky <ducky@sodalite.rocks>
Date: Tue, 11 Apr 2023 19:42:03 +0100
Subject: [PATCH 12/26] =?UTF-8?q?=F0=9F=93=A6=20various=20changes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/actions/prepare/action.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/actions/prepare/action.yml b/.github/actions/prepare/action.yml
index 083c85a..45b4458 100644
--- a/.github/actions/prepare/action.yml
+++ b/.github/actions/prepare/action.yml
@@ -5,8 +5,6 @@ inputs:
 runs:
   using: "composite"
   steps:
-      - run: "[[ $(id -u) != 0 ]] && exit 255"
-        shell: bash
       - if: ${{ inputs.branch != '' }}
         run: git checkout ${{ inputs.branch }}
         shell: bash

From bad9a1dbcc2bcb620c97711d304c08eebc81d67c Mon Sep 17 00:00:00 2001
From: Ducky <ducky@sodalite.rocks>
Date: Tue, 11 Apr 2023 19:51:06 +0100
Subject: [PATCH 13/26] =?UTF-8?q?=F0=9F=93=A6=20various=20changes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/actions/build/action.yml | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml
index ec3e811..d23ba06 100644
--- a/.github/actions/build/action.yml
+++ b/.github/actions/build/action.yml
@@ -1,5 +1,11 @@
 name: Build
 inputs:
+  container_image:
+    required: false
+    type: string
+  dry_run:
+    required: false
+    type: boolean
   tree:
     required: true
     type: string
@@ -7,13 +13,26 @@ runs:
   using: "composite"
   steps:
       - run: |
+           function test_input() {
+               input="$1"
+               default_value="$2"
+
+               if [[ "$input" == "" ]]; then
+                   echo "$input"
+               else
+                   echo "$default_value"
+               fi
+           }
+
+            echo "$(test_input "${{ inputs.container_image }}" "fedora:37")"
+
           ./build.sh \
             --container \
             --tree "${{ inputs.tree }}" \
             --vendor "sodaliterocks" \
             --working-dir "/srv/store/variable/ostree" \
             --ex-container-hostname "$(hostname -f)" \
-            --ex-container-image "fedora:37" \
+            --ex-container-image "$(test_input "${{ inputs.container_image }}" "fedora:37")" \
             --ex-override-starttime "$(date +%s)" \
             --ex-print-github-release-table-row
         shell: bash

From c52c94598d30387578e1ffe3d56b7e3d8410b495 Mon Sep 17 00:00:00 2001
From: Ducky <ducky@sodalite.rocks>
Date: Tue, 11 Apr 2023 19:52:57 +0100
Subject: [PATCH 14/26] =?UTF-8?q?=F0=9F=93=A6=20various=20changes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/actions/build/action.yml | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml
index d23ba06..9c120cc 100644
--- a/.github/actions/build/action.yml
+++ b/.github/actions/build/action.yml
@@ -13,19 +13,14 @@ runs:
   using: "composite"
   steps:
       - run: |
-           function test_input() {
-               input="$1"
-               default_value="$2"
-
-               if [[ "$input" == "" ]]; then
-                   echo "$input"
-               else
-                   echo "$default_value"
-               fi
-           }
-
-            echo "$(test_input "${{ inputs.container_image }}" "fedora:37")"
-
+          function test_input() {
+              if [[ "$1" == "" ]]; then
+                  echo "$1"
+              else
+                  echo "$2"
+              fi
+          }
+          echo "$(test_input "${{ inputs.container_image }}" "fedora:37")"
           ./build.sh \
             --container \
             --tree "${{ inputs.tree }}" \

From 400e9f2eacd34ba86914a210f082d61b11f8832b Mon Sep 17 00:00:00 2001
From: Ducky <ducky@sodalite.rocks>
Date: Tue, 11 Apr 2023 19:54:10 +0100
Subject: [PATCH 15/26] =?UTF-8?q?=F0=9F=A7=B9=20build=20(actions):=20fix?=
 =?UTF-8?q?=20broken=20logic?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/actions/build/action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml
index 9c120cc..e9b9ced 100644
--- a/.github/actions/build/action.yml
+++ b/.github/actions/build/action.yml
@@ -14,7 +14,7 @@ runs:
   steps:
       - run: |
           function test_input() {
-              if [[ "$1" == "" ]]; then
+              if [[ "$1" != "" ]]; then
                   echo "$1"
               else
                   echo "$2"

From f17a683241cd29b1c0034e6ebe442b6c91e4b03f Mon Sep 17 00:00:00 2001
From: Ducky <ducky@sodalite.rocks>
Date: Tue, 11 Apr 2023 20:03:40 +0100
Subject: [PATCH 16/26] =?UTF-8?q?=F0=9F=93=A6=20various=20changes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/actions/build/action.yml    |  1 -
 .github/workflows/update.manual.yml | 16 ++++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml
index e9b9ced..38c8b2d 100644
--- a/.github/actions/build/action.yml
+++ b/.github/actions/build/action.yml
@@ -20,7 +20,6 @@ runs:
                   echo "$2"
               fi
           }
-          echo "$(test_input "${{ inputs.container_image }}" "fedora:37")"
           ./build.sh \
             --container \
             --tree "${{ inputs.tree }}" \
diff --git a/.github/workflows/update.manual.yml b/.github/workflows/update.manual.yml
index 748e600..56866fc 100644
--- a/.github/workflows/update.manual.yml
+++ b/.github/workflows/update.manual.yml
@@ -13,6 +13,22 @@ on:
         - desktop-budgie
         - desktop-deepin
         - desktop-gnome
+      dry_run:
+        default: false
+        description: "Dry Run"
+        type: boolean
+      container_image:
+        default: fedora:37
+        description: "Container Image"
+        required: true
+        type: choice
+        options:
+        - "fedora:latest"
+        - "fedora:36"
+        - "fedora:37"
+        - "fedora:38"
+        - "fedora:39"
+        - "fedora:rawhide"
 
 jobs:
   ci:

From 7a8ed160713962b94dd0cc98c204920478615347 Mon Sep 17 00:00:00 2001
From: Ducky <ducky@sodalite.rocks>
Date: Tue, 11 Apr 2023 22:22:24 +0100
Subject: [PATCH 17/26] =?UTF-8?q?=F0=9F=93=A6=20various=20changes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/updated.scheduled.yml | 37 +++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 .github/workflows/updated.scheduled.yml

diff --git a/.github/workflows/updated.scheduled.yml b/.github/workflows/updated.scheduled.yml
new file mode 100644
index 0000000..2ebe9ff
--- /dev/null
+++ b/.github/workflows/updated.scheduled.yml
@@ -0,0 +1,37 @@
+name: "Update (Scheduled)"
+
+on:
+  schedule:
+    - cron: '0 4 * * 3,6' # At 04:00 on Wednesday and Saturday
+
+jobs:
+  desktop--current:
+    name: "Desktop (Current)"
+    runs-on: self-hosted
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ./.github/actions/prepare
+      - uses: ./.github/actions/build
+        with:
+          branch: release/current
+          tree: desktop
+  desktop--long-4:
+    name: "Desktop (Long 4)"
+    runs-on: self-hosted
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ./.github/actions/prepare
+      - uses: ./.github/actions/build
+        with:
+          branch: release/long/4
+          tree: desktop
+  desktop--next:
+    name: "Desktop (Next)"
+    runs-on: self-hosted
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ./.github/actions/prepare
+      - uses: ./.github/actions/build
+        with:
+          branch: release/next
+          tree: desktop

From 3de5aacb77f50c25770ba1dcf3460568060b8871 Mon Sep 17 00:00:00 2001
From: Ducky <ducky@sodalite.rocks>
Date: Tue, 11 Apr 2023 22:25:35 +0100
Subject: [PATCH 18/26] =?UTF-8?q?=F0=9F=93=A6=20various=20changes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/{updated.scheduled.yml => update.scheduled.yml} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename .github/workflows/{updated.scheduled.yml => update.scheduled.yml} (100%)

diff --git a/.github/workflows/updated.scheduled.yml b/.github/workflows/update.scheduled.yml
similarity index 100%
rename from .github/workflows/updated.scheduled.yml
rename to .github/workflows/update.scheduled.yml

From c0f15a4946dee3e1acf28b9c59f0fd4067e87208 Mon Sep 17 00:00:00 2001
From: Ducky <ducky@sodalite.rocks>
Date: Tue, 11 Apr 2023 22:40:45 +0100
Subject: [PATCH 19/26] =?UTF-8?q?=F0=9F=93=A6=20various=20changes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/actions/build/action.yml    | 38 ++++++++++++++++++-----------
 .github/workflows/ci.yml            | 17 +++++++++++++
 .github/workflows/update.manual.yml |  3 ++-
 3 files changed, 43 insertions(+), 15 deletions(-)
 create mode 100644 .github/workflows/ci.yml

diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml
index 38c8b2d..7b6ea9d 100644
--- a/.github/actions/build/action.yml
+++ b/.github/actions/build/action.yml
@@ -14,19 +14,29 @@ runs:
   steps:
       - run: |
           function test_input() {
-              if [[ "$1" != "" ]]; then
-                  echo "$1"
-              else
-                  echo "$2"
-              fi
+              [[ "$1" != "" ]] && echo "$1" || echo "$2"
           }
-          ./build.sh \
-            --container \
-            --tree "${{ inputs.tree }}" \
-            --vendor "sodaliterocks" \
-            --working-dir "/srv/store/variable/ostree" \
-            --ex-container-hostname "$(hostname -f)" \
-            --ex-container-image "$(test_input "${{ inputs.container_image }}" "fedora:37")" \
-            --ex-override-starttime "$(date +%s)" \
-            --ex-print-github-release-table-row
+          start_time="$(date +%s)"
+          if [[ ${{ inputs.dry_run }} == "true" ]]; then
+              working_dir="/tmp/sodalite-build-$start_time"
+              ./build.sh \
+                  --container \
+                  --tree "${{ inputs.tree }}" \
+                  --vendor "sodaliterocks" \
+                  --working-dir "$working_dir" \
+                  --ex-container-hostname "$(hostname -f)" \
+                  --ex-container-image "$(test_input "${{ inputs.container_image }}" "fedora:37")" \
+                  --ex-override-starttime "$start_time"
+              rm -rf "$working_dir"
+          else
+              ./build.sh \
+                  --container \
+                  --tree "${{ inputs.tree }}" \
+                  --vendor "sodaliterocks" \
+                  --working-dir "/srv/store/variable/ostree" \
+                  --ex-container-hostname "$(hostname -f)" \
+                  --ex-container-image "$(test_input "${{ inputs.container_image }}" "fedora:37")" \
+                  --ex-override-starttime "$start_time" \
+                  --ex-print-github-release-table-row
+          fi
         shell: bash
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 0000000..f4f9063
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,17 @@
+name: CI
+
+on:
+  workflow_dispatch:
+
+jobs:
+  desktop--devel:
+    name: "Desktop (Devel)"
+    runs-on: self-hosted
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ./.github/actions/prepare
+      - uses: ./.github/actions/build
+        with:
+          branch: main
+          dry_run: true
+          tree: desktop
diff --git a/.github/workflows/update.manual.yml b/.github/workflows/update.manual.yml
index 56866fc..35b9aeb 100644
--- a/.github/workflows/update.manual.yml
+++ b/.github/workflows/update.manual.yml
@@ -31,7 +31,8 @@ on:
         - "fedora:rawhide"
 
 jobs:
-  ci:
+  custom:
+    name: "Custom"
     runs-on: self-hosted
     steps:
       - uses: actions/checkout@v3

From dfab54c489d94f2de12486e95404cdb0ff3674d4 Mon Sep 17 00:00:00 2001
From: Ducky <ducky@sodalite.rocks>
Date: Tue, 11 Apr 2023 22:44:35 +0100
Subject: [PATCH 20/26] =?UTF-8?q?=F0=9F=93=A6=20various=20changes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/ci.yml               |  3 ++-
 .github/workflows/update.scheduled.yml | 10 +++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f4f9063..ff9a770 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -10,8 +10,9 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - uses: ./.github/actions/prepare
-      - uses: ./.github/actions/build
         with:
           branch: main
+      - uses: ./.github/actions/build
+        with:
           dry_run: true
           tree: desktop
diff --git a/.github/workflows/update.scheduled.yml b/.github/workflows/update.scheduled.yml
index 2ebe9ff..c55b88a 100644
--- a/.github/workflows/update.scheduled.yml
+++ b/.github/workflows/update.scheduled.yml
@@ -3,6 +3,7 @@ name: "Update (Scheduled)"
 on:
   schedule:
     - cron: '0 4 * * 3,6' # At 04:00 on Wednesday and Saturday
+  workflow_dispatch:
 
 jobs:
   desktop--current:
@@ -11,9 +12,10 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - uses: ./.github/actions/prepare
-      - uses: ./.github/actions/build
         with:
           branch: release/current
+      - uses: ./.github/actions/build
+        with:
           tree: desktop
   desktop--long-4:
     name: "Desktop (Long 4)"
@@ -21,9 +23,10 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - uses: ./.github/actions/prepare
-      - uses: ./.github/actions/build
         with:
           branch: release/long/4
+      - uses: ./.github/actions/build
+        with:
           tree: desktop
   desktop--next:
     name: "Desktop (Next)"
@@ -31,7 +34,8 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - uses: ./.github/actions/prepare
-      - uses: ./.github/actions/build
         with:
           branch: release/next
+      - uses: ./.github/actions/build
+        with:
           tree: desktop

From 0ab013d919c76b2c7388cb6bbfd457dbf0e3dcf9 Mon Sep 17 00:00:00 2001
From: Ducky <ducky@sodalite.rocks>
Date: Tue, 11 Apr 2023 22:48:43 +0100
Subject: [PATCH 21/26] =?UTF-8?q?=F0=9F=93=A6=20various=20changes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/actions/{build => ci}/action.yml  | 13 ++++++++++++-
 .github/actions/prepare/action.yml        | 16 ----------------
 .github/workflows/{ci.yml => nightly.yml} |  6 ++----
 .github/workflows/update.manual.yml       |  1 -
 .github/workflows/update.scheduled.yml    | 12 +++---------
 5 files changed, 17 insertions(+), 31 deletions(-)
 rename .github/actions/{build => ci}/action.yml (81%)
 delete mode 100644 .github/actions/prepare/action.yml
 rename .github/workflows/{ci.yml => nightly.yml} (81%)

diff --git a/.github/actions/build/action.yml b/.github/actions/ci/action.yml
similarity index 81%
rename from .github/actions/build/action.yml
rename to .github/actions/ci/action.yml
index 7b6ea9d..fea277f 100644
--- a/.github/actions/build/action.yml
+++ b/.github/actions/ci/action.yml
@@ -1,5 +1,7 @@
-name: Build
+name: CI
 inputs:
+  branch:
+    type: string
   container_image:
     required: false
     type: string
@@ -12,6 +14,15 @@ inputs:
 runs:
   using: "composite"
   steps:
+      - if: ${{ inputs.branch != '' }}
+        run: git checkout ${{ inputs.branch }}
+        shell: bash
+      - run: git fetch --tags origin
+        shell: bash
+      - run: git submodule sync
+        shell: bash
+      - run: git submodule update --init --recursive
+        shell: bash
       - run: |
           function test_input() {
               [[ "$1" != "" ]] && echo "$1" || echo "$2"
diff --git a/.github/actions/prepare/action.yml b/.github/actions/prepare/action.yml
deleted file mode 100644
index 45b4458..0000000
--- a/.github/actions/prepare/action.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-name: Prepare
-inputs:
-  branch:
-    type: string
-runs:
-  using: "composite"
-  steps:
-      - if: ${{ inputs.branch != '' }}
-        run: git checkout ${{ inputs.branch }}
-        shell: bash
-      - run: git fetch --tags origin
-        shell: bash
-      - run: git submodule sync
-        shell: bash
-      - run: git submodule update --init --recursive
-        shell: bash
diff --git a/.github/workflows/ci.yml b/.github/workflows/nightly.yml
similarity index 81%
rename from .github/workflows/ci.yml
rename to .github/workflows/nightly.yml
index ff9a770..c8ff73d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/nightly.yml
@@ -1,4 +1,4 @@
-name: CI
+name: Nightly
 
 on:
   workflow_dispatch:
@@ -9,10 +9,8 @@ jobs:
     runs-on: self-hosted
     steps:
       - uses: actions/checkout@v3
-      - uses: ./.github/actions/prepare
-        with:
-          branch: main
       - uses: ./.github/actions/build
         with:
+          branch: main
           dry_run: true
           tree: desktop
diff --git a/.github/workflows/update.manual.yml b/.github/workflows/update.manual.yml
index 35b9aeb..b6d7689 100644
--- a/.github/workflows/update.manual.yml
+++ b/.github/workflows/update.manual.yml
@@ -36,7 +36,6 @@ jobs:
     runs-on: self-hosted
     steps:
       - uses: actions/checkout@v3
-      - uses: ./.github/actions/prepare
       - uses: ./.github/actions/build
         with:
           tree: ${{ inputs.tree }}
diff --git a/.github/workflows/update.scheduled.yml b/.github/workflows/update.scheduled.yml
index c55b88a..ef8fc6a 100644
--- a/.github/workflows/update.scheduled.yml
+++ b/.github/workflows/update.scheduled.yml
@@ -11,31 +11,25 @@ jobs:
     runs-on: self-hosted
     steps:
       - uses: actions/checkout@v3
-      - uses: ./.github/actions/prepare
-        with:
-          branch: release/current
       - uses: ./.github/actions/build
         with:
+          branch: release/current
           tree: desktop
   desktop--long-4:
     name: "Desktop (Long 4)"
     runs-on: self-hosted
     steps:
       - uses: actions/checkout@v3
-      - uses: ./.github/actions/prepare
-        with:
-          branch: release/long/4
       - uses: ./.github/actions/build
         with:
+          branch: release/long/4
           tree: desktop
   desktop--next:
     name: "Desktop (Next)"
     runs-on: self-hosted
     steps:
       - uses: actions/checkout@v3
-      - uses: ./.github/actions/prepare
-        with:
-          branch: release/next
       - uses: ./.github/actions/build
         with:
+          branch: release/next
           tree: desktop

From 7c1b11d45e287c29589890574b47cf789a8b9ca6 Mon Sep 17 00:00:00 2001
From: Ducky <ducky@sodalite.rocks>
Date: Tue, 11 Apr 2023 22:49:31 +0100
Subject: [PATCH 22/26] =?UTF-8?q?=F0=9F=93=A6=20various=20changes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/nightly.yml          | 2 +-
 .github/workflows/update.manual.yml    | 2 +-
 .github/workflows/update.scheduled.yml | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index c8ff73d..209735c 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -9,7 +9,7 @@ jobs:
     runs-on: self-hosted
     steps:
       - uses: actions/checkout@v3
-      - uses: ./.github/actions/build
+      - uses: ./.github/actions/ci
         with:
           branch: main
           dry_run: true
diff --git a/.github/workflows/update.manual.yml b/.github/workflows/update.manual.yml
index b6d7689..2adffc5 100644
--- a/.github/workflows/update.manual.yml
+++ b/.github/workflows/update.manual.yml
@@ -36,6 +36,6 @@ jobs:
     runs-on: self-hosted
     steps:
       - uses: actions/checkout@v3
-      - uses: ./.github/actions/build
+      - uses: ./.github/actions/ci
         with:
           tree: ${{ inputs.tree }}
diff --git a/.github/workflows/update.scheduled.yml b/.github/workflows/update.scheduled.yml
index ef8fc6a..b0b8ca9 100644
--- a/.github/workflows/update.scheduled.yml
+++ b/.github/workflows/update.scheduled.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: self-hosted
     steps:
       - uses: actions/checkout@v3
-      - uses: ./.github/actions/build
+      - uses: ./.github/actions/ci
         with:
           branch: release/current
           tree: desktop
@@ -20,7 +20,7 @@ jobs:
     runs-on: self-hosted
     steps:
       - uses: actions/checkout@v3
-      - uses: ./.github/actions/build
+      - uses: ./.github/actions/ci
         with:
           branch: release/long/4
           tree: desktop
@@ -29,7 +29,7 @@ jobs:
     runs-on: self-hosted
     steps:
       - uses: actions/checkout@v3
-      - uses: ./.github/actions/build
+      - uses: ./.github/actions/ci
         with:
           branch: release/next
           tree: desktop

From 43a57aa87f952756a65116ff9f38fc1cb75eecb1 Mon Sep 17 00:00:00 2001
From: Ducky <ducky@sodalite.rocks>
Date: Tue, 11 Apr 2023 22:50:42 +0100
Subject: [PATCH 23/26] =?UTF-8?q?=F0=9F=A7=B9=20ci=20(actions):=20fix=20br?=
 =?UTF-8?q?oken=20logic?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/actions/ci/action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/actions/ci/action.yml b/.github/actions/ci/action.yml
index fea277f..22c3fd7 100644
--- a/.github/actions/ci/action.yml
+++ b/.github/actions/ci/action.yml
@@ -28,7 +28,7 @@ runs:
               [[ "$1" != "" ]] && echo "$1" || echo "$2"
           }
           start_time="$(date +%s)"
-          if [[ ${{ inputs.dry_run }} == "true" ]]; then
+          if [[ "${{ inputs.dry_run }}" != "" ]]; then
               working_dir="/tmp/sodalite-build-$start_time"
               ./build.sh \
                   --container \

From 227c0bd57faadcba7de6233c20edbf23d7d4ab53 Mon Sep 17 00:00:00 2001
From: Ducky <ducky@sodalite.rocks>
Date: Thu, 13 Apr 2023 02:21:00 +0100
Subject: [PATCH 24/26] =?UTF-8?q?=F0=9F=93=A6=20various=20changes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/nightly.yml                    | 16 ----------------
 ...cheduled.yml => update.scheduled.current.yml} | 16 +++-------------
 .github/workflows/update.scheduled.long-4.yml    | 16 ++++++++++++++++
 .github/workflows/update.scheduled.next.yml      | 16 ++++++++++++++++
 4 files changed, 35 insertions(+), 29 deletions(-)
 delete mode 100644 .github/workflows/nightly.yml
 rename .github/workflows/{update.scheduled.yml => update.scheduled.current.yml} (59%)
 create mode 100644 .github/workflows/update.scheduled.long-4.yml
 create mode 100644 .github/workflows/update.scheduled.next.yml

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
deleted file mode 100644
index 209735c..0000000
--- a/.github/workflows/nightly.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-name: Nightly
-
-on:
-  workflow_dispatch:
-
-jobs:
-  desktop--devel:
-    name: "Desktop (Devel)"
-    runs-on: self-hosted
-    steps:
-      - uses: actions/checkout@v3
-      - uses: ./.github/actions/ci
-        with:
-          branch: main
-          dry_run: true
-          tree: desktop
diff --git a/.github/workflows/update.scheduled.yml b/.github/workflows/update.scheduled.current.yml
similarity index 59%
rename from .github/workflows/update.scheduled.yml
rename to .github/workflows/update.scheduled.current.yml
index b0b8ca9..2814143 100644
--- a/.github/workflows/update.scheduled.yml
+++ b/.github/workflows/update.scheduled.current.yml
@@ -1,13 +1,12 @@
-name: "Update (Scheduled)"
+name: "Update: Current"
 
 on:
   schedule:
     - cron: '0 4 * * 3,6' # At 04:00 on Wednesday and Saturday
-  workflow_dispatch:
 
 jobs:
-  desktop--current:
-    name: "Desktop (Current)"
+  desktop:
+    name: "Desktop"
     runs-on: self-hosted
     steps:
       - uses: actions/checkout@v3
@@ -15,15 +14,6 @@ jobs:
         with:
           branch: release/current
           tree: desktop
-  desktop--long-4:
-    name: "Desktop (Long 4)"
-    runs-on: self-hosted
-    steps:
-      - uses: actions/checkout@v3
-      - uses: ./.github/actions/ci
-        with:
-          branch: release/long/4
-          tree: desktop
   desktop--next:
     name: "Desktop (Next)"
     runs-on: self-hosted
diff --git a/.github/workflows/update.scheduled.long-4.yml b/.github/workflows/update.scheduled.long-4.yml
new file mode 100644
index 0000000..eb6e1e7
--- /dev/null
+++ b/.github/workflows/update.scheduled.long-4.yml
@@ -0,0 +1,16 @@
+name: "Update: Long (4)"
+
+on:
+  schedule:
+    - cron: '0 4 * * 3,6' # At 04:00 on Wednesday and Saturday
+
+jobs:
+  desktop:
+    name: "Desktop"
+    runs-on: self-hosted
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ./.github/actions/ci
+        with:
+          branch: release/long/4
+          tree: desktop
diff --git a/.github/workflows/update.scheduled.next.yml b/.github/workflows/update.scheduled.next.yml
new file mode 100644
index 0000000..7463c6b
--- /dev/null
+++ b/.github/workflows/update.scheduled.next.yml
@@ -0,0 +1,16 @@
+name: "Update: Next"
+
+on:
+  schedule:
+    - cron: '0 4 * * 3,6' # At 04:00 on Wednesday and Saturday
+
+jobs:
+  desktop:
+    name: "Desktop (Next)"
+    runs-on: self-hosted
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ./.github/actions/ci
+        with:
+          branch: release/next
+          tree: desktop

From 3c0c6b557e08a9b171c8c3cb48037750d27e3968 Mon Sep 17 00:00:00 2001
From: Ducky <ducky@sodalite.rocks>
Date: Fri, 21 Apr 2023 22:44:58 +0100
Subject: [PATCH 25/26] =?UTF-8?q?=F0=9F=93=A6=20various=20changes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/update.scheduled.current.yml | 9 ---------
 .github/workflows/update.scheduled.next.yml    | 2 +-
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/.github/workflows/update.scheduled.current.yml b/.github/workflows/update.scheduled.current.yml
index 2814143..0367938 100644
--- a/.github/workflows/update.scheduled.current.yml
+++ b/.github/workflows/update.scheduled.current.yml
@@ -14,12 +14,3 @@ jobs:
         with:
           branch: release/current
           tree: desktop
-  desktop--next:
-    name: "Desktop (Next)"
-    runs-on: self-hosted
-    steps:
-      - uses: actions/checkout@v3
-      - uses: ./.github/actions/ci
-        with:
-          branch: release/next
-          tree: desktop
diff --git a/.github/workflows/update.scheduled.next.yml b/.github/workflows/update.scheduled.next.yml
index 7463c6b..1ce1752 100644
--- a/.github/workflows/update.scheduled.next.yml
+++ b/.github/workflows/update.scheduled.next.yml
@@ -6,7 +6,7 @@ on:
 
 jobs:
   desktop:
-    name: "Desktop (Next)"
+    name: "Desktop"
     runs-on: self-hosted
     steps:
       - uses: actions/checkout@v3

From 9d5774ccb65829e5a396e488586e5626acbcb907 Mon Sep 17 00:00:00 2001
From: Ducky <ducky@sodalite.rocks>
Date: Mon, 29 May 2023 15:05:35 +0100
Subject: [PATCH 26/26] =?UTF-8?q?=E2=9C=A8=20version=204.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/cores/common.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cores/common.yaml b/src/cores/common.yaml
index e49d923..85a9f4d 100644
--- a/src/cores/common.yaml
+++ b/src/cores/common.yaml
@@ -5,7 +5,7 @@ include: [
   "../packages/tools.yaml",
 ]
 
-automatic-version-prefix: "5.0rc2-<date:%y%j>"
+automatic-version-prefix: "4.2-<date:%y%j>"
 automatic-version-suffix: "."
 mutate-os-release: "${releasever}"