From ad18b195f662edb9362e3815e5ddc746af101c53 Mon Sep 17 00:00:00 2001
From: Alsey Coleman Miller <alseycmiller@gmail.com>
Date: Thu, 26 Dec 2024 07:59:30 -0500
Subject: [PATCH] Update GitHub CI

---
 .github/workflows/buildroot-experimental.yml |  3 ++-
 .github/workflows/buildroot-host.yml         | 14 +++++---------
 .github/workflows/docker.yml                 |  3 ++-
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/buildroot-experimental.yml b/.github/workflows/buildroot-experimental.yml
index fa1f174..f587713 100644
--- a/.github/workflows/buildroot-experimental.yml
+++ b/.github/workflows/buildroot-experimental.yml
@@ -1,5 +1,6 @@
 name: Buildroot experimental
-on: [workflow_dispatch]
+on: 
+  workflow_dispatch:
 jobs:
 
     build-riscv64:
diff --git a/.github/workflows/buildroot-host.yml b/.github/workflows/buildroot-host.yml
index 8921c5d..f92c6f0 100644
--- a/.github/workflows/buildroot-host.yml
+++ b/.github/workflows/buildroot-host.yml
@@ -1,8 +1,9 @@
 name: Buildroot Host
-on: [workflow_dispatch]
+on: 
+  workflow_dispatch:
 jobs:
-  build-toolchain:
-        name: Build Toolchain for Buildroot
+  build:
+        name: Build from scratch
         strategy:
           matrix:
             config: ["arm64", "armv7", "armv6", "armv5", "x86_64", "i386", "ppc64le"]
@@ -17,13 +18,8 @@ jobs:
           run: |
             export SWIFT_BUILDROOT=$GITHUB_WORKSPACE
             export SWIFT_TARGET_ARCH=${{ matrix.config }}
-            tar -xvf ./host-tools.tar.gz
             $SWIFT_BUILDROOT/.devcontainer/build-scripts/download-buildroot.sh
-            $SWIFT_BUILDROOT/.devcontainer/build-scripts/configure.sh
-            $SWIFT_BUILDROOT/.devcontainer/build-scripts/fetch-sources.sh
-            $SWIFT_BUILDROOT/.devcontainer/build-scripts/build-host-tools.sh
-            $SWIFT_BUILDROOT/.devcontainer/build-scripts/build-host-swift.sh
-            $SWIFT_BUILDROOT/.devcontainer/build-scripts/build-toolchain.sh
+            $SWIFT_BUILDROOT/.devcontainer/build-scripts/build.sh
         - name: Archive Build artifacts
           uses: actions/upload-artifact@v3
           with:
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index cf5edce..4a29bcd 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -1,6 +1,7 @@
 name: Publish Docker image
 
-on: [workflow_dispatch]
+on: 
+  workflow_dispatch:
 
 jobs:
   push_to_registry: