From 2fd441483128c9ab68e58d480bb25dc71086eafa Mon Sep 17 00:00:00 2001
From: Jeremy Massel <1123407+jkmassel@users.noreply.github.com>
Date: Mon, 4 Dec 2023 23:18:16 -0700
Subject: [PATCH] Move all Linux build logic into the workflow

Signed-off-by: Jeremy Massel <1123407+jkmassel@users.noreply.github.com>
---
 .github/workflows/ci.yml      |  6 ++----
 .github/workflows/release.yml | 20 +++++++++++++++-----
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9fbdd7c..c79b0f1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -33,9 +33,7 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v1
-      - name: Install Ruby
-        run: apt-get update && apt-get install -y ruby zlib1g-dev
       - name: Build and Run
-        run: LANG=en_US.UTF-8 LC_CTYPE=UTF-8 rake build[release]
+        run: swift build
       - name: Test
-        run: LANG=en_US.UTF-8 LC_CTYPE=UTF-8 rake test
+        run: swift test
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f42cf7b..eab917e 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -49,18 +49,28 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v1
-      - name: Install Ruby
-        run: apt-get update && apt-get install -y ruby zlib1g-dev
+
+      # Build with dynamically linked stdlib
       - name: Build
-        run: LANG=en_US.UTF-8 LC_CTYPE=UTF-8 rake build[release]
+        run: swift build -c release
       - name: Set tag name
         run: echo "TAG_NAME=$(echo $GITHUB_REF | cut -c 11-)" >> $GITHUB_ENV
       - name: Zip release
         uses: montudor/action-zip@v0.1.0
         with:
           args: zip -j XCLogParser-linux-amd64.zip .build/release/xclogparser
-      - name: Rename zip
-        run: "mkdir releases && mv XCLogParser-linux-amd64.zip releases/XCLogParser-linux-amd64-$TAG_NAME.zip"
+
+      # Build standalone
+      - name: Build
+        run: swift build -c release --static-swift-stdlib
+      - name: Zip release
+        uses: montudor/action-zip@v0.1.0
+        with:
+          args: zip -j XCLogParser-linux-amd64-standalone.zip .build/release/xclogparser
+
+      # Package
+      - name: Rename Zip Files
+        run: "mkdir -p releases && mv *.zip releases/"
       - name: Upload binaries to release
         uses: svenstaro/upload-release-action@v1-release
         with: