From 65835bc46322a8442a00ec1f6aef15bfb226c21e Mon Sep 17 00:00:00 2001
From: "Jesse L. Zamora" <xtremekforever@gmail.com>
Date: Mon, 30 Dec 2024 07:59:51 -0500
Subject: [PATCH] Cleanup build-container calls, store SWIFT_VERSION as a
 string

 - Otherwise it is seen as a double or int which causes issues
---
 .github/workflows/build-swift-latest.yml  | 6 ++----
 .github/workflows/build-swift-nightly.yml | 4 +---
 .github/workflows/build-swift-release.yml | 6 ++----
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/build-swift-latest.yml b/.github/workflows/build-swift-latest.yml
index 40b7dd7..a1f19b1 100644
--- a/.github/workflows/build-swift-latest.yml
+++ b/.github/workflows/build-swift-latest.yml
@@ -16,7 +16,7 @@ jobs:
           - swift-target-arch: "armv6"
             distribution: "raspios-bookworm"
     env:
-      SWIFT_VERSION: 6.0.3
+      SWIFT_VERSION: "6.0.3"
       SWIFT_TAG: swift-6.0.3-RELEASE
     name: Build Swift
     runs-on: ubuntu-latest
@@ -29,9 +29,7 @@ jobs:
         swift-workspace-cache: swift-workspace
     - name: Generate Builder Container
       shell: bash
-      run: |
-        source ./swift-builder/swift-builder-common
-        ./swift-builder/build-container.sh
+      run: ./swift-builder/build-container.sh
     - uses: ./.github/actions/build-for-distribution
       name: Build & Publish Swift ${{ env.SWIFT_VERSION }}
       with:
diff --git a/.github/workflows/build-swift-nightly.yml b/.github/workflows/build-swift-nightly.yml
index f000fb0..81c7e23 100644
--- a/.github/workflows/build-swift-nightly.yml
+++ b/.github/workflows/build-swift-nightly.yml
@@ -36,9 +36,7 @@ jobs:
         swift-workspace-cache: ${{ env.SWIFT_WORKSPACE_CACHE }}
     - name: Build Swift Nightly Container
       shell: bash
-      run: |
-        source ./swift-builder/swift-builder-common
-        ./swift-builder/build-container.sh
+      run: ./swift-builder/build-container.sh
     - uses: ./.github/actions/build-for-distribution
       name: Build & Publish Swift
       with:
diff --git a/.github/workflows/build-swift-release.yml b/.github/workflows/build-swift-release.yml
index 00c2769..6039b71 100644
--- a/.github/workflows/build-swift-release.yml
+++ b/.github/workflows/build-swift-release.yml
@@ -5,7 +5,7 @@ on:
     branches: [ "release/6.0.3" ]
 
 env:
-  SWIFT_VERSION: 6.0.3
+  SWIFT_VERSION: "6.0.3"
   SWIFT_TAG: swift-6.0.3-RELEASE
   SWIFT_WORKSPACE_CACHE: swift-workspace
 
@@ -38,9 +38,7 @@ jobs:
     - uses: actions/checkout@v4
     - name: Generate Builder Container
       shell: bash
-      run: |
-        source ./swift-builder/swift-builder-common
-        ./swift-builder/build-container.sh
+      run: ./swift-builder/build-container.sh
     - uses: ./.github/actions/build-for-distribution
       name: "Build & Publish Swift ${{ env.SWIFT_VERSION }}"
       with: