From dd389bc19dea95ffd6166877410d2bc85fa5846d Mon Sep 17 00:00:00 2001
From: ConcelareDev <113200622+ConcelareDev@users.noreply.github.com>
Date: Wed, 21 Feb 2024 14:18:35 +0000
Subject: [PATCH 01/19] Create nightly.yml

Setting Up workflow for Nightly Building/Releasing
---
 .github/workflows/nightly.yml | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 .github/workflows/nightly.yml

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
new file mode 100644
index 0000000000..c6c8f91a89
--- /dev/null
+++ b/.github/workflows/nightly.yml
@@ -0,0 +1,30 @@
+# .github/workflows/build.yml
+name: nightly
+
+on:
+  push:
+    branches: [main]
+
+jobs:
+  release:
+    name: nightly release ${{ matrix.target }}
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - target: x86_64-pc-windows-gnu
+            archive: zip
+          - target: x86_64-unknown-linux-musl
+            archive: tar.gz tar.xz tar.zst
+          - target: x86_64-apple-darwin
+            archive: zip
+    steps:
+      - uses: actions/checkout@master
+      - name: Compile and release
+        uses: rust-build/rust-build.action@v1.4.4
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          RUSTTARGET: ${{ matrix.target }}
+          ARCHIVE_TYPES: ${{ matrix.archive }}

From 5ba810bac2d88cf42a3151a81db67df5c9d455c1 Mon Sep 17 00:00:00 2001
From: ConcelareDev <113200622+ConcelareDev@users.noreply.github.com>
Date: Wed, 21 Feb 2024 14:30:43 +0000
Subject: [PATCH 02/19] Update nightly.yml

Setting Time to Test it
---
 .github/workflows/nightly.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index c6c8f91a89..4fddfaa46b 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -2,8 +2,8 @@
 name: nightly
 
 on:
-  push:
-    branches: [main]
+  schedule:
+    - cron: '35 14 * * *' # run at 2 AM UTC
 
 jobs:
   release:

From 25b1526cfa63193635a6170e373d7092124bf7b2 Mon Sep 17 00:00:00 2001
From: ConcelareDev <113200622+ConcelareDev@users.noreply.github.com>
Date: Wed, 21 Feb 2024 14:40:33 +0000
Subject: [PATCH 03/19] Update nightly.yml

---
 .github/workflows/nightly.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 4fddfaa46b..514369dcf1 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -3,7 +3,8 @@ name: nightly
 
 on:
   schedule:
-    - cron: '35 14 * * *' # run at 2 AM UTC
+    - cron: '0 2 * * *'
+  workflow_call:
 
 jobs:
   release:

From 678d9479007738bae0bf5a2c5f968ed130c2d25b Mon Sep 17 00:00:00 2001
From: ConcelareDev <113200622+ConcelareDev@users.noreply.github.com>
Date: Wed, 21 Feb 2024 14:41:58 +0000
Subject: [PATCH 04/19] Update nightly.yml

---
 .github/workflows/nightly.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 514369dcf1..0652a7c772 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -1,10 +1,7 @@
 # .github/workflows/build.yml
 name: nightly
 
-on:
-  schedule:
-    - cron: '0 2 * * *'
-  workflow_call:
+on: workflow_call
 
 jobs:
   release:

From fbcbe5316587b4186916ee67ffea8503d6b5c1d1 Mon Sep 17 00:00:00 2001
From: ConcelareDev <113200622+ConcelareDev@users.noreply.github.com>
Date: Wed, 21 Feb 2024 14:46:07 +0000
Subject: [PATCH 05/19] Update nightly.yml

---
 .github/workflows/nightly.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 0652a7c772..6a59726dbf 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -1,8 +1,7 @@
 # .github/workflows/build.yml
 name: nightly
 
-on: workflow_call
-
+on: workflow_dispatch
 jobs:
   release:
     name: nightly release ${{ matrix.target }}

From 08d8d1a6120a61e1bbfcf3ad99779acafffc6be0 Mon Sep 17 00:00:00 2001
From: ConcelareDev <113200622+ConcelareDev@users.noreply.github.com>
Date: Wed, 21 Feb 2024 16:20:18 +0000
Subject: [PATCH 06/19] Update nightly.yml

---
 .github/workflows/nightly.yml | 178 ++++++++++++++++++++++++++++++----
 1 file changed, 158 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 6a59726dbf..04d3e9bee3 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -1,27 +1,165 @@
-# .github/workflows/build.yml
-name: nightly
-
+name: Build Nightly Releases
 on: workflow_dispatch
+
+env:
+  CARGO_TERM_COLOR: always
+
 jobs:
-  release:
-    name: nightly release ${{ matrix.target }}
+  build:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+        rust: [nightly, stable, '1.65']
+    runs-on: ${{ matrix.os }}
+    continue-on-error: ${{ matrix.rust == 'nightly' }}
+
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Restore cargo cache
+      uses: Swatinem/rust-cache@v2
+      env:
+        cache-name: ci
+      with:
+        shared-key: ${{ matrix.os }}-${{ env.cache-name }}-${{ matrix.rust }}
+
+    - name: MacOS Workaround
+      if: matrix.os == 'macos-latest'
+      run: cargo clean -p serde_derive -p thiserror
+
+    - name: Install Rust
+      uses: dtolnay/rust-toolchain@master
+      with:
+        toolchain: ${{ matrix.rust }}
+        components: clippy
+
+    - name: Build Debug
+      run: |
+        cargo build
+
+    - name: Run tests
+      run: make test
+
+    - name: Run clippy
+      run: |
+        make clippy
+
+    - name: Build Release
+      run: make build-release
+
+    - name: Test Install
+      run: cargo install --path "." --force --locked
+
+    - name: Binary Size (unix)
+      if: matrix.os != 'windows-latest'
+      run: |
+        ls -l ./target/release/gitui
+
+    - name: Binary Size (win)
+      if: matrix.os == 'windows-latest'
+      run: |
+        ls -l ./target/release/gitui.exe
+
+    - name: Binary dependencies (mac)
+      if: matrix.os == 'macos-latest'
+      run: |
+        otool -L ./target/release/gitui
+
+    - name: Build MSI (windows)
+      if: matrix.os == 'windows-latest'
+      run: |
+        cargo install cargo-wix --version 0.3.3
+        cargo wix --version
+        cargo wix -p gitui --no-build --nocapture --output ./target/wix/gitui.msi
+        ls -l ./target/wix/gitui.msi
+
+  build-linux-musl:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        rust: [nightly, stable, '1.65']
+    continue-on-error: ${{ matrix.rust == 'nightly' }}
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Restore cargo cache
+      uses: Swatinem/rust-cache@v2
+      env:
+        cache-name: ci
+      with:
+        key: ubuntu-latest-${{ env.cache-name }}-${{ matrix.rust }}
+
+    - name: Install Rust
+      uses: dtolnay/rust-toolchain@master
+      with:
+        toolchain: ${{ matrix.rust }}
+        targets: x86_64-unknown-linux-musl
+    
+    # The build would fail without manually installing the target.
+    # https://github.com/dtolnay/rust-toolchain/issues/83
+    - name: Manually install target
+      run: rustup target add x86_64-unknown-linux-musl
+
+    - name: Setup MUSL
+      run: |
+        sudo apt-get -qq install musl-tools
+    - name: Build Debug
+      run: |
+        make build-linux-musl-debug
+        ./target/x86_64-unknown-linux-musl/debug/gitui --version
+    - name: Build Release
+      run: |
+        make build-linux-musl-release
+        ./target/x86_64-unknown-linux-musl/release/gitui --version
+        ls -l ./target/x86_64-unknown-linux-musl/release/gitui
+    - name: Test
+      run: |
+        make test-linux-musl
+    - name: Test Install
+      run: cargo install --path "." --force --locked
+
+  build-linux-arm:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        include:
-          - target: x86_64-pc-windows-gnu
-            archive: zip
-          - target: x86_64-unknown-linux-musl
-            archive: tar.gz tar.xz tar.zst
-          - target: x86_64-apple-darwin
-            archive: zip
+        rust: [nightly, stable, '1.65']
+    continue-on-error: ${{ matrix.rust == 'nightly' }}
     steps:
-      - uses: actions/checkout@master
-      - name: Compile and release
-        uses: rust-build/rust-build.action@v1.4.4
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          RUSTTARGET: ${{ matrix.target }}
-          ARCHIVE_TYPES: ${{ matrix.archive }}
+    - uses: actions/checkout@v4
+
+    - name: Restore cargo cache
+      uses: Swatinem/rust-cache@v2
+      env:
+        cache-name: ci
+      with:
+        key: ubuntu-latest-${{ env.cache-name }}-${{ matrix.rust }}
+
+    - name: Install Rust
+      uses: dtolnay/rust-toolchain@master
+      with:
+        toolchain: ${{ matrix.rust }}
+    - name: Setup ARM toolchain
+      run: |
+        rustup target add aarch64-unknown-linux-gnu
+        rustup target add armv7-unknown-linux-gnueabihf
+        rustup target add arm-unknown-linux-gnueabihf
+
+        curl -o $GITHUB_WORKSPACE/aarch64.tar.xz https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu-a/8.2-2018.08/gcc-arm-8.2-2018.08-x86_64-aarch64-linux-gnu.tar.xz
+        curl -o $GITHUB_WORKSPACE/arm.tar.xz https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu-a/8.2-2018.08/gcc-arm-8.2-2018.08-x86_64-arm-linux-gnueabihf.tar.xz
+
+        tar xf $GITHUB_WORKSPACE/aarch64.tar.xz
+        tar xf $GITHUB_WORKSPACE/arm.tar.xz
+
+        echo "$GITHUB_WORKSPACE/gcc-arm-8.2-2018.08-x86_64-aarch64-linux-gnu/bin" >> $GITHUB_PATH
+        echo "$GITHUB_WORKSPACE/gcc-arm-8.2-2018.08-x86_64-arm-linux-gnueabihf/bin" >> $GITHUB_PATH
+
+    - name: Build Debug
+      run: |
+        make build-linux-arm-debug
+    - name: Build Release
+      run: |
+        make build-linux-arm-release
+        ls -l ./target/aarch64-unknown-linux-gnu/release/gitui || ls -l ./target/armv7-unknown-linux-gnueabihf/release/gitui || ls -l ./target/arm-unknown-linux-gnueabihf/release/gitui

From 6b60ef5a85e0056c045577b7b648493ac04b883d Mon Sep 17 00:00:00 2001
From: ConcelareDev <113200622+ConcelareDev@users.noreply.github.com>
Date: Wed, 21 Feb 2024 16:52:16 +0000
Subject: [PATCH 07/19] Update nightly.yml

---
 .github/workflows/nightly.yml | 165 +++++++++++-----------------------
 1 file changed, 50 insertions(+), 115 deletions(-)

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 04d3e9bee3..e6edea9eb0 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -1,147 +1,59 @@
 name: Build Nightly Releases
-on: workflow_dispatch
+on: 
+  workflow_dispatch:
+  schedule:
+    - cron: '0 0 * * *' # run at 0 AM UTC
 
 env:
   CARGO_TERM_COLOR: always
 
 jobs:
-  build:
+  release:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
-        rust: [nightly, stable, '1.65']
+        os: [ubuntu-latest, macos-latest, windows-latest, ubuntu-22.04]
     runs-on: ${{ matrix.os }}
-    continue-on-error: ${{ matrix.rust == 'nightly' }}
 
     steps:
     - uses: actions/checkout@v4
 
+    - name: Get version
+      id: get_version
+      run: echo "version=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_OUTPUT
+
     - name: Restore cargo cache
       uses: Swatinem/rust-cache@v2
       env:
         cache-name: ci
       with:
-        shared-key: ${{ matrix.os }}-${{ env.cache-name }}-${{ matrix.rust }}
-
-    - name: MacOS Workaround
-      if: matrix.os == 'macos-latest'
-      run: cargo clean -p serde_derive -p thiserror
+        shared-key: ${{ matrix.os }}-${{ env.cache-name }}-stable
 
     - name: Install Rust
-      uses: dtolnay/rust-toolchain@master
+      uses: dtolnay/rust-toolchain@stable
       with:
-        toolchain: ${{ matrix.rust }}
         components: clippy
 
-    - name: Build Debug
-      run: |
-        cargo build
-
+    - name: Build
+      if: matrix.os != 'ubuntu-22.04'
+      run: cargo build
     - name: Run tests
+      if: matrix.os != 'ubuntu-22.04'
       run: make test
-
     - name: Run clippy
+      if: matrix.os != 'ubuntu-22.04'
       run: |
+        cargo clean
         make clippy
 
-    - name: Build Release
-      run: make build-release
-
-    - name: Test Install
-      run: cargo install --path "." --force --locked
-
-    - name: Binary Size (unix)
-      if: matrix.os != 'windows-latest'
-      run: |
-        ls -l ./target/release/gitui
-
-    - name: Binary Size (win)
-      if: matrix.os == 'windows-latest'
-      run: |
-        ls -l ./target/release/gitui.exe
-
-    - name: Binary dependencies (mac)
-      if: matrix.os == 'macos-latest'
-      run: |
-        otool -L ./target/release/gitui
-
-    - name: Build MSI (windows)
-      if: matrix.os == 'windows-latest'
-      run: |
-        cargo install cargo-wix --version 0.3.3
-        cargo wix --version
-        cargo wix -p gitui --no-build --nocapture --output ./target/wix/gitui.msi
-        ls -l ./target/wix/gitui.msi
-
-  build-linux-musl:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        rust: [nightly, stable, '1.65']
-    continue-on-error: ${{ matrix.rust == 'nightly' }}
-    steps:
-    - uses: actions/checkout@v4
-
-    - name: Restore cargo cache
-      uses: Swatinem/rust-cache@v2
-      env:
-        cache-name: ci
-      with:
-        key: ubuntu-latest-${{ env.cache-name }}-${{ matrix.rust }}
-
-    - name: Install Rust
-      uses: dtolnay/rust-toolchain@master
-      with:
-        toolchain: ${{ matrix.rust }}
-        targets: x86_64-unknown-linux-musl
-    
-    # The build would fail without manually installing the target.
-    # https://github.com/dtolnay/rust-toolchain/issues/83
-    - name: Manually install target
-      run: rustup target add x86_64-unknown-linux-musl
-
     - name: Setup MUSL
+      if: matrix.os == 'ubuntu-latest'
       run: |
+        rustup target add x86_64-unknown-linux-musl
         sudo apt-get -qq install musl-tools
-    - name: Build Debug
-      run: |
-        make build-linux-musl-debug
-        ./target/x86_64-unknown-linux-musl/debug/gitui --version
-    - name: Build Release
-      run: |
-        make build-linux-musl-release
-        ./target/x86_64-unknown-linux-musl/release/gitui --version
-        ls -l ./target/x86_64-unknown-linux-musl/release/gitui
-    - name: Test
-      run: |
-        make test-linux-musl
-    - name: Test Install
-      run: cargo install --path "." --force --locked
 
-  build-linux-arm:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        rust: [nightly, stable, '1.65']
-    continue-on-error: ${{ matrix.rust == 'nightly' }}
-    steps:
-    - uses: actions/checkout@v4
-
-    - name: Restore cargo cache
-      uses: Swatinem/rust-cache@v2
-      env:
-        cache-name: ci
-      with:
-        key: ubuntu-latest-${{ env.cache-name }}-${{ matrix.rust }}
-
-    - name: Install Rust
-      uses: dtolnay/rust-toolchain@master
-      with:
-        toolchain: ${{ matrix.rust }}
     - name: Setup ARM toolchain
+      if: matrix.os == 'ubuntu-22.04'
       run: |
         rustup target add aarch64-unknown-linux-gnu
         rustup target add armv7-unknown-linux-gnueabihf
@@ -156,10 +68,33 @@ jobs:
         echo "$GITHUB_WORKSPACE/gcc-arm-8.2-2018.08-x86_64-aarch64-linux-gnu/bin" >> $GITHUB_PATH
         echo "$GITHUB_WORKSPACE/gcc-arm-8.2-2018.08-x86_64-arm-linux-gnueabihf/bin" >> $GITHUB_PATH
 
-    - name: Build Debug
-      run: |
-        make build-linux-arm-debug
-    - name: Build Release
+    - name: Build Release Mac
+      if: matrix.os == 'macos-latest'
+      run: make release-mac
+    - name: Build Release Linux
+      if: matrix.os == 'ubuntu-latest'
+      run: make release-linux-musl
+    - name: Build Release Win
+      if: matrix.os == 'windows-latest'
+      run: make release-win
+    - name: Build Release Linux ARM
+      if: matrix.os == 'ubuntu-22.04'
+      run: make release-linux-arm
+
+    - name: Set SHA
+      if: matrix.os == 'macos-latest'
+      id: shasum
       run: |
-        make build-linux-arm-release
-        ls -l ./target/aarch64-unknown-linux-gnu/release/gitui || ls -l ./target/armv7-unknown-linux-gnueabihf/release/gitui || ls -l ./target/arm-unknown-linux-gnueabihf/release/gitui
+        echo sha="$(shasum -a 256 ./release/gitui-mac.tar.gz | awk '{printf $1}')" >> $GITHUB_OUTPUT
+  
+    - name: Nightly-Release
+      uses: softprops/action-gh-release@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        body: ${{ steps.release_notes.outputs.release_notes }}
+        prerelease: true
+        files: |
+          ./release/*.tar.gz
+          ./release/*.zip
+          ./release/*.msi

From d1ecf1532e442d66e2f307b170444b34d8a2e2be Mon Sep 17 00:00:00 2001
From: ConcelareDev <113200622+ConcelareDev@users.noreply.github.com>
Date: Wed, 21 Feb 2024 17:04:56 +0000
Subject: [PATCH 08/19] Update nightly.yml

---
 .github/workflows/nightly.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index e6edea9eb0..b07cfa4b59 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -94,6 +94,7 @@ jobs:
       with:
         body: ${{ steps.release_notes.outputs.release_notes }}
         prerelease: true
+        tag_name: "nightly"
         files: |
           ./release/*.tar.gz
           ./release/*.zip

From c2e7c0a68f7a5a3d9d2139f011b423f436b65501 Mon Sep 17 00:00:00 2001
From: ConcelareDev <113200622+ConcelareDev@users.noreply.github.com>
Date: Wed, 21 Feb 2024 18:02:30 +0000
Subject: [PATCH 09/19] Update nightly.yml

Cleaned up a line
---
 .github/workflows/nightly.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index b07cfa4b59..1447703a04 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -92,7 +92,6 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
-        body: ${{ steps.release_notes.outputs.release_notes }}
         prerelease: true
         tag_name: "nightly"
         files: |

From e8db80859bd459dce9363b0a95b36e27bec23462 Mon Sep 17 00:00:00 2001
From: ConcelareDev <113200622+ConcelareDev@users.noreply.github.com>
Date: Sun, 25 Feb 2024 20:32:51 +0000
Subject: [PATCH 10/19] Update nightly.yml

Testing new method of releasing
---
 .github/workflows/nightly.yml | 39 +++++++++++++++++++++++++----------
 1 file changed, 28 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 1447703a04..c2de0f3ff9 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -86,15 +86,32 @@ jobs:
       id: shasum
       run: |
         echo sha="$(shasum -a 256 ./release/gitui-mac.tar.gz | awk '{printf $1}')" >> $GITHUB_OUTPUT
-  
-    - name: Nightly-Release
-      uses: softprops/action-gh-release@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+
+    - name: Ubuntu 22.04 Upload Artifact
+      if: matrix.os != 'ubuntu-22.04'
+      uses: actions/upload-artifact@v4
+      with:
+        name: 'ubuntu-22.04'
+        path: ./release/*.zip
+
+    - name: Ubuntu Latest Upload Artifact
+      if: matrix.os != 'ubuntu-latest'
+      uses: actions/upload-artifact@v4
+      with:
+        name: 'ubuntu-latest'
+        path: ./release/*.zip
+    
+    - name: MacOS Upload Artifact
+      if: matrix.os == 'macos-latest'  
+      uses: actions/upload-artifact@v4
+      with:
+        name: 'macos-latest'
+        path: ./release/*.tar.gz
+        
+    - name: Windows Upload Artifact
+      if: matrix.os == 'windows-latest' 
+      uses: actions/upload-artifact@v4
       with:
-        prerelease: true
-        tag_name: "nightly"
-        files: |
-          ./release/*.tar.gz
-          ./release/*.zip
-          ./release/*.msi
+        name: 'windows-latest'
+        path: ./release/*.msi

From 3b58e7d10fa4b6b620e93a5d389a97602f26a2f9 Mon Sep 17 00:00:00 2001
From: Concelare <113200622+Concelare@users.noreply.github.com>
Date: Sun, 3 Mar 2024 02:34:56 +0000
Subject: [PATCH 11/19] Update nightly.yml

---
 .github/workflows/nightly.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index c2de0f3ff9..96d23fee75 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -89,14 +89,14 @@ jobs:
 
 
     - name: Ubuntu 22.04 Upload Artifact
-      if: matrix.os != 'ubuntu-22.04'
+      if: matrix.os == 'ubuntu-22.04'
       uses: actions/upload-artifact@v4
       with:
         name: 'ubuntu-22.04'
         path: ./release/*.zip
 
     - name: Ubuntu Latest Upload Artifact
-      if: matrix.os != 'ubuntu-latest'
+      if: matrix.os == 'ubuntu-latest'
       uses: actions/upload-artifact@v4
       with:
         name: 'ubuntu-latest'

From 8d39ef796ee5d94e982ceb54c0fb47f8b63e7369 Mon Sep 17 00:00:00 2001
From: Concelare <113200622+Concelare@users.noreply.github.com>
Date: Sun, 3 Mar 2024 03:37:55 +0000
Subject: [PATCH 12/19] Update nightly.yml

---
 .github/workflows/nightly.yml | 42 +++++++++++++++++++++++------------
 1 file changed, 28 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 96d23fee75..04c7b8b2ea 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -88,30 +88,44 @@ jobs:
         echo sha="$(shasum -a 256 ./release/gitui-mac.tar.gz | awk '{printf $1}')" >> $GITHUB_OUTPUT
 
 
+    - name: List Folder
+      uses: philips-labs/list-folders-action@v1
+      with:
+        path: ./release
+
+
     - name: Ubuntu 22.04 Upload Artifact
       if: matrix.os == 'ubuntu-22.04'
-      uses: actions/upload-artifact@v4
+      uses: shallwefootball/s3-upload-action@master
       with:
-        name: 'ubuntu-22.04'
-        path: ./release/*.zip
-
+          aws_key_id: ${{ secrets.AWS_KEY_ID }}
+          aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY}}
+          aws_bucket: ${{ secrets.AWS_BUCKET }}
+          source_dir: './release/*.zip'
+          
     - name: Ubuntu Latest Upload Artifact
       if: matrix.os == 'ubuntu-latest'
-      uses: actions/upload-artifact@v4
+      uses: shallwefootball/s3-upload-action@master
       with:
-        name: 'ubuntu-latest'
-        path: ./release/*.zip
+         aws_key_id: ${{ secrets.AWS_KEY_ID }}
+         aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY}}
+         aws_bucket: ${{ secrets.AWS_BUCKET }}
+         source_dir: './release/*.zip'
     
     - name: MacOS Upload Artifact
       if: matrix.os == 'macos-latest'  
-      uses: actions/upload-artifact@v4
+      uses: shallwefootball/s3-upload-action@master
       with:
-        name: 'macos-latest'
-        path: ./release/*.tar.gz
-        
+        aws_key_id: ${{ secrets.AWS_KEY_ID }}
+        aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY}}
+        aws_bucket: ${{ secrets.AWS_BUCKET }}
+        source_dir: './release/*.tar.gz'
+
     - name: Windows Upload Artifact
       if: matrix.os == 'windows-latest' 
-      uses: actions/upload-artifact@v4
+      uses: shallwefootball/s3-upload-action@master
       with:
-        name: 'windows-latest'
-        path: ./release/*.msi
+        aws_key_id: ${{ secrets.AWS_KEY_ID }}
+        aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY}}
+        aws_bucket: ${{ secrets.AWS_BUCKET }}
+        source_dir: './release/*.msi'

From 24e6f9015c491b92a197a923f0a42f44bf8fdc81 Mon Sep 17 00:00:00 2001
From: Concelare <113200622+Concelare@users.noreply.github.com>
Date: Sun, 3 Mar 2024 03:42:49 +0000
Subject: [PATCH 13/19] Update nightly.yml

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

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 04c7b8b2ea..71fcf61187 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -89,7 +89,7 @@ jobs:
 
 
     - name: List Folder
-      uses: philips-labs/list-folders-action@v1
+      uses: kmanimaran/list-folder-action@v4
       with:
         path: ./release
 

From 94090f89c27fe2f1d545d1115292f0d6776e2eff Mon Sep 17 00:00:00 2001
From: Concelare <113200622+Concelare@users.noreply.github.com>
Date: Sun, 3 Mar 2024 03:56:47 +0000
Subject: [PATCH 14/19] Update nightly.yml

---
 .github/workflows/nightly.yml | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 71fcf61187..adcf565d34 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -87,13 +87,6 @@ jobs:
       run: |
         echo sha="$(shasum -a 256 ./release/gitui-mac.tar.gz | awk '{printf $1}')" >> $GITHUB_OUTPUT
 
-
-    - name: List Folder
-      uses: kmanimaran/list-folder-action@v4
-      with:
-        path: ./release
-
-
     - name: Ubuntu 22.04 Upload Artifact
       if: matrix.os == 'ubuntu-22.04'
       uses: shallwefootball/s3-upload-action@master
@@ -101,7 +94,7 @@ jobs:
           aws_key_id: ${{ secrets.AWS_KEY_ID }}
           aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY}}
           aws_bucket: ${{ secrets.AWS_BUCKET }}
-          source_dir: './release/*.zip'
+          source_dir: './release/*.tar.gz'
           
     - name: Ubuntu Latest Upload Artifact
       if: matrix.os == 'ubuntu-latest'
@@ -110,7 +103,7 @@ jobs:
          aws_key_id: ${{ secrets.AWS_KEY_ID }}
          aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY}}
          aws_bucket: ${{ secrets.AWS_BUCKET }}
-         source_dir: './release/*.zip'
+         source_dir: './release/*.tar.gz'
     
     - name: MacOS Upload Artifact
       if: matrix.os == 'macos-latest'  

From 1d342f49a3a5dfa49eaa5711019544ab120a620a Mon Sep 17 00:00:00 2001
From: Concelare <113200622+Concelare@users.noreply.github.com>
Date: Sun, 3 Mar 2024 04:07:42 +0000
Subject: [PATCH 15/19] Update nightly.yml

---
 .github/workflows/nightly.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index adcf565d34..3c2526830f 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -94,7 +94,7 @@ jobs:
           aws_key_id: ${{ secrets.AWS_KEY_ID }}
           aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY}}
           aws_bucket: ${{ secrets.AWS_BUCKET }}
-          source_dir: './release/*.tar.gz'
+          source_dir: './release/gitui-linux-arm.tar.gz'
           
     - name: Ubuntu Latest Upload Artifact
       if: matrix.os == 'ubuntu-latest'
@@ -103,7 +103,7 @@ jobs:
          aws_key_id: ${{ secrets.AWS_KEY_ID }}
          aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY}}
          aws_bucket: ${{ secrets.AWS_BUCKET }}
-         source_dir: './release/*.tar.gz'
+         source_dir: './release/gitui-linux-musl.tar.gz'
     
     - name: MacOS Upload Artifact
       if: matrix.os == 'macos-latest'  

From 0755f93960bcfdc540956c31407a75de0108cb3e Mon Sep 17 00:00:00 2001
From: Concelare <113200622+Concelare@users.noreply.github.com>
Date: Sun, 3 Mar 2024 04:17:56 +0000
Subject: [PATCH 16/19] Update nightly.yml

---
 .github/workflows/nightly.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 3c2526830f..deb971fdc3 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -94,7 +94,7 @@ jobs:
           aws_key_id: ${{ secrets.AWS_KEY_ID }}
           aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY}}
           aws_bucket: ${{ secrets.AWS_BUCKET }}
-          source_dir: './release/gitui-linux-arm.tar.gz'
+          source_dir: './release'
           
     - name: Ubuntu Latest Upload Artifact
       if: matrix.os == 'ubuntu-latest'
@@ -103,7 +103,7 @@ jobs:
          aws_key_id: ${{ secrets.AWS_KEY_ID }}
          aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY}}
          aws_bucket: ${{ secrets.AWS_BUCKET }}
-         source_dir: './release/gitui-linux-musl.tar.gz'
+         source_dir: './release'
     
     - name: MacOS Upload Artifact
       if: matrix.os == 'macos-latest'  
@@ -112,7 +112,7 @@ jobs:
         aws_key_id: ${{ secrets.AWS_KEY_ID }}
         aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY}}
         aws_bucket: ${{ secrets.AWS_BUCKET }}
-        source_dir: './release/*.tar.gz'
+        source_dir: './release'
 
     - name: Windows Upload Artifact
       if: matrix.os == 'windows-latest' 
@@ -121,4 +121,4 @@ jobs:
         aws_key_id: ${{ secrets.AWS_KEY_ID }}
         aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY}}
         aws_bucket: ${{ secrets.AWS_BUCKET }}
-        source_dir: './release/*.msi'
+        source_dir: './release'

From 734068684b5f838c1469de679e059fa049f37459 Mon Sep 17 00:00:00 2001
From: Concelare <113200622+Concelare@users.noreply.github.com>
Date: Tue, 5 Mar 2024 06:56:01 +0000
Subject: [PATCH 17/19] Update nightly.yml

---
 .github/workflows/nightly.yml | 58 ++++++++++++++++++++---------------
 1 file changed, 33 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index deb971fdc3..bc401fbd28 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -89,36 +89,44 @@ jobs:
 
     - name: Ubuntu 22.04 Upload Artifact
       if: matrix.os == 'ubuntu-22.04'
-      uses: shallwefootball/s3-upload-action@master
-      with:
-          aws_key_id: ${{ secrets.AWS_KEY_ID }}
-          aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY}}
-          aws_bucket: ${{ secrets.AWS_BUCKET }}
-          source_dir: './release'
+      env:
+        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_KEY_ID }}
+        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_KEY_SECRET }}
+        AWS_DEFAULT_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
+        AWS_BUCKET_NAME: ${{ secrets.AWS_BUCKET_NAME }}
+      run: |
+        aws s3 cp ./release/gitui-linux-armv7.tar.gz s3://"$AWS_BUCKET_NAME"
+        aws s3 cp ./release/gitui-linux-arm.tar.gz s3://"$AWS_BUCKET_NAME"
+        aws s3 cp ./release/gitui-linux-aarch64.tar.gz s3://"$AWS_BUCKET_NAME"
           
     - name: Ubuntu Latest Upload Artifact
       if: matrix.os == 'ubuntu-latest'
-      uses: shallwefootball/s3-upload-action@master
-      with:
-         aws_key_id: ${{ secrets.AWS_KEY_ID }}
-         aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY}}
-         aws_bucket: ${{ secrets.AWS_BUCKET }}
-         source_dir: './release'
-    
+      env:
+        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_KEY_ID }}
+        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_KEY_SECRET }}
+        AWS_DEFAULT_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
+        AWS_BUCKET_NAME: ${{ secrets.AWS_BUCKET_NAME }}
+      run: |
+        aws s3 cp ./release/gitui-linux-musl.tar.gz s3://"$AWS_BUCKET_NAME"
+      
+
     - name: MacOS Upload Artifact
       if: matrix.os == 'macos-latest'  
-      uses: shallwefootball/s3-upload-action@master
-      with:
-        aws_key_id: ${{ secrets.AWS_KEY_ID }}
-        aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY}}
-        aws_bucket: ${{ secrets.AWS_BUCKET }}
-        source_dir: './release'
+      env:
+        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_KEY_ID }}
+        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_KEY_SECRET }}
+        AWS_DEFAULT_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
+        AWS_BUCKET_NAME: ${{ secrets.AWS_BUCKET_NAME }}
+      run: |
+        aws s3 cp ./release/gitui-mac.tar.gz s3://"$AWS_BUCKET_NAME"
 
     - name: Windows Upload Artifact
       if: matrix.os == 'windows-latest' 
-      uses: shallwefootball/s3-upload-action@master
-      with:
-        aws_key_id: ${{ secrets.AWS_KEY_ID }}
-        aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY}}
-        aws_bucket: ${{ secrets.AWS_BUCKET }}
-        source_dir: './release'
+      env:
+        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_KEY_ID }}
+        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_KEY_SECRET }}
+        AWS_DEFAULT_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
+        AWS_BUCKET_NAME: ${{ secrets.AWS_BUCKET_NAME }}
+      run: |
+        aws s3 cp ./release/gitui.msi s3://"$AWS_BUCKET_NAME"
+        aws s3 cp ./release/gitui-win.tar.gz s3://"$AWS_BUCKET_NAME"

From 646424db0a7db133e730c32cb7b3afa94b3f38f2 Mon Sep 17 00:00:00 2001
From: Concelare <113200622+Concelare@users.noreply.github.com>
Date: Tue, 5 Mar 2024 08:19:56 +0000
Subject: [PATCH 18/19] Update nightly.yml

Fixing Windows env variable syntax
---
 .github/workflows/nightly.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index bc401fbd28..00b63ae1dd 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -128,5 +128,5 @@ jobs:
         AWS_DEFAULT_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
         AWS_BUCKET_NAME: ${{ secrets.AWS_BUCKET_NAME }}
       run: |
-        aws s3 cp ./release/gitui.msi s3://"$AWS_BUCKET_NAME"
-        aws s3 cp ./release/gitui-win.tar.gz s3://"$AWS_BUCKET_NAME"
+        aws s3 cp ./release/gitui.msi s3://"$env:AWS_BUCKET_NAME"
+        aws s3 cp ./release/gitui-win.tar.gz s3://"$env:AWS_BUCKET_NAME"

From 939a832f42f84a229b1dc859c2427cd8d8eea5fc Mon Sep 17 00:00:00 2001
From: Concelare <113200622+Concelare@users.noreply.github.com>
Date: Tue, 5 Mar 2024 08:40:38 +0000
Subject: [PATCH 19/19] Update nightly.yml

Updating to use the /nightly-builds directory
---
 .github/workflows/nightly.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 00b63ae1dd..2481c50b05 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -95,9 +95,9 @@ jobs:
         AWS_DEFAULT_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
         AWS_BUCKET_NAME: ${{ secrets.AWS_BUCKET_NAME }}
       run: |
-        aws s3 cp ./release/gitui-linux-armv7.tar.gz s3://"$AWS_BUCKET_NAME"
-        aws s3 cp ./release/gitui-linux-arm.tar.gz s3://"$AWS_BUCKET_NAME"
-        aws s3 cp ./release/gitui-linux-aarch64.tar.gz s3://"$AWS_BUCKET_NAME"
+        aws s3 cp ./release/gitui-linux-armv7.tar.gz s3://"$AWS_BUCKET_NAME"/nightly-builds/
+        aws s3 cp ./release/gitui-linux-arm.tar.gz s3://"$AWS_BUCKET_NAME"/nightly-builds/
+        aws s3 cp ./release/gitui-linux-aarch64.tar.gz s3://"$AWS_BUCKET_NAME"/nightly-builds/
           
     - name: Ubuntu Latest Upload Artifact
       if: matrix.os == 'ubuntu-latest'
@@ -107,7 +107,7 @@ jobs:
         AWS_DEFAULT_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
         AWS_BUCKET_NAME: ${{ secrets.AWS_BUCKET_NAME }}
       run: |
-        aws s3 cp ./release/gitui-linux-musl.tar.gz s3://"$AWS_BUCKET_NAME"
+        aws s3 cp ./release/gitui-linux-musl.tar.gz s3://"$AWS_BUCKET_NAME"/nightly-builds/
       
 
     - name: MacOS Upload Artifact
@@ -118,7 +118,7 @@ jobs:
         AWS_DEFAULT_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
         AWS_BUCKET_NAME: ${{ secrets.AWS_BUCKET_NAME }}
       run: |
-        aws s3 cp ./release/gitui-mac.tar.gz s3://"$AWS_BUCKET_NAME"
+        aws s3 cp ./release/gitui-mac.tar.gz s3://"$AWS_BUCKET_NAME"/nightly-builds/
 
     - name: Windows Upload Artifact
       if: matrix.os == 'windows-latest' 
@@ -128,5 +128,5 @@ jobs:
         AWS_DEFAULT_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
         AWS_BUCKET_NAME: ${{ secrets.AWS_BUCKET_NAME }}
       run: |
-        aws s3 cp ./release/gitui.msi s3://"$env:AWS_BUCKET_NAME"
-        aws s3 cp ./release/gitui-win.tar.gz s3://"$env:AWS_BUCKET_NAME"
+        aws s3 cp ./release/gitui.msi s3://"$env:AWS_BUCKET_NAME"/nightly-builds/
+        aws s3 cp ./release/gitui-win.tar.gz s3://"$env:AWS_BUCKET_NAME"/nightly-builds/