From 7f7929145e274901cc04a60c85e1439c18c74a68 Mon Sep 17 00:00:00 2001
From: Zack Brady <zackbrady123@gmail.com>
Date: Thu, 26 Sep 2024 20:16:55 -0400
Subject: [PATCH] and more updates upon updates

---
 .github/workflows/main.yaml | 90 ++++++++++++++++++-------------------
 1 file changed, 43 insertions(+), 47 deletions(-)

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index c9c6a69..af0b31e 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -417,92 +417,88 @@ jobs:
           curl -sfOL https://github.com/hauler-dev/hauler/releases/download/v${HaulerVersion}/hauler_${HaulerVersion}_windows_amd64.tar.gz
           curl -sfOL https://github.com/hauler-dev/hauler/releases/download/v${HaulerVersion}/hauler_${HaulerVersion}_windows_arm64.tar.gz
           for file in *.tar.gz; do
-            folder_name="${file%.tar.gz}"
-
-            mkdir -p "$folder_name"
-
-            tar -xzf "$file" -C "$folder_name"
-
-            rm -f "$file"
+              folder_name="${file%.tar.gz}"
+              mkdir -p "$folder_name"
+              tar -xzf "$file" -C "$folder_name"
+              rm -f "$file"
           done
-          zip -r hauler-binaries.zip ./*_checksums.txt */
-          aws s3 cp hauler-binaries.zip s3://carbide/${{ github.ref_name }}/
-          aws s3 ls s3://carbide/${{ github.ref_name }}
+          tar --zstd -cvf hauler-binaries.tar.zst ./*_checksums.txt */
+          aws s3 cp --no-progress hauler-binaries.tar.zst s3://carbide/${{ github.ref_name }}/
 
       - name: Upload Hauler
         run: |
-          source ~/.bashrc
-          aws s3 cp hauler/hauler/hauler-carbide.tar.zst s3://carbide/${{ github.ref_name }}/
-          aws s3 ls s3://carbide/${{ github.ref_name }}
+          cd hauler/hauler && source ~/.bashrc
+          aws s3 cp --no-progress hauler-carbide-amd64.tar.zst s3://carbide/${{ github.ref_name }}/
+          aws s3 cp --no-progress hauler-carbide-arm64.tar.zst s3://carbide/${{ github.ref_name }}/
 
       - name: Upload Helm
         run: |
-          source ~/.bashrc
-          aws s3 cp hauler/helm/helm-carbide.tar.zst s3://carbide/${{ github.ref_name }}/
-          aws s3 ls s3://carbide/${{ github.ref_name }}
+          cd hauler/helm && source ~/.bashrc
+          aws s3 cp --no-progress helm-carbide-amd64.tar.zst s3://carbide/${{ github.ref_name }}/
+          aws s3 cp --no-progress helm-carbide-arm64.tar.zst s3://carbide/${{ github.ref_name }}/
 
       - name: Upload Cosign
         run: |
           cd hauler/cosign && source ~/.bashrc
-          aws s3 cp cosign-carbide.tar.zst s3://carbide/${{ github.ref_name }}/
-          aws s3 ls s3://carbide/${{ github.ref_name }}
+          aws s3 cp --no-progress cosign-carbide-amd64.tar.zst s3://carbide/${{ github.ref_name }}/
+          aws s3 cp --no-progress cosign-carbide-arm64.tar.zst s3://carbide/${{ github.ref_name }}/
 
       - name: Upload RKE2
         run: |
           cd hauler/rke2 && source ~/.bashrc
-          aws s3 cp rke2-carbide.tar.zst s3://carbide/${{ github.ref_name }}/
-          aws s3 ls s3://carbide/${{ github.ref_name }}
+          aws s3 cp --no-progress rke2-carbide-amd64.tar.zst s3://carbide/${{ github.ref_name }}/
+          aws s3 cp --no-progress rke2-carbide-arm64.tar.zst s3://carbide/${{ github.ref_name }}/
 
       - name: Upload Rancher
         run: |
-          source ~/.bashrc
-          aws s3 cp hauler/rancher/rancher-carbide.tar.zst s3://carbide/${{ github.ref_name }}/
-          aws s3 ls s3://carbide/${{ github.ref_name }}
+          cd hauler/rancher && source ~/.bashrc
+          aws s3 cp --no-progress rancher-carbide-amd64.tar.zst s3://carbide/${{ github.ref_name }}/
+          aws s3 cp --no-progress rancher-carbide-arm64.tar.zst s3://carbide/${{ github.ref_name }}/
 
       - name: Upload Rancher Minimal
         run: |
-          source ~/.bashrc
-          aws s3 cp hauler/rancher/rancher-minimal-carbide.tar.zst s3://carbide/${{ github.ref_name }}/
-          aws s3 ls s3://carbide/${{ github.ref_name }}
+          cd hauler/rancher && source ~/.bashrc
+          aws s3 cp --no-progress rancher-minimal-carbide-amd64.tar.zst s3://carbide/${{ github.ref_name }}/
+          aws s3 cp --no-progress rancher-minimal-carbide-arm64.tar.zst s3://carbide/${{ github.ref_name }}/
 
       - name: Upload Longhorn
         run: |
-          source ~/.bashrc
-          aws s3 cp hauler/longhorn/longhorn-carbide.tar.zst s3://carbide/${{ github.ref_name }}/
-          aws s3 ls s3://carbide/${{ github.ref_name }}
+          cd hauler/longhorn && source ~/.bashrc
+          aws s3 cp --no-progress longhorn-carbide-amd64.tar.zst s3://carbide/${{ github.ref_name }}/
+          aws s3 cp --no-progress longhorn-carbide-arm64.tar.zst s3://carbide/${{ github.ref_name }}/
 
       - name: Upload NeuVector
         run: |
-          source ~/.bashrc
-          aws s3 cp hauler/neuvector/neuvector-carbide.tar.zst s3://carbide/${{ github.ref_name }}/
-          aws s3 ls s3://carbide/${{ github.ref_name }}
+          cd hauler/neuvector && source ~/.bashrc
+          aws s3 cp --no-progress neuvector-carbide-amd64.tar.zst s3://carbide/${{ github.ref_name }}/
+          aws s3 cp --no-progress neuvector-carbide-arm64.tar.zst s3://carbide/${{ github.ref_name }}/
 
       - name: Upload Harvester
         run: |
-          source ~/.bashrc
-          aws s3 cp hauler/harvester/harvester-carbide.tar.zst s3://carbide/${{ github.ref_name }}/
-          aws s3 ls s3://carbide/${{ github.ref_name }}
+          cd hauler/harvester && source ~/.bashrc
+          aws s3 cp --no-progress harvester-carbide-amd64.tar.zst s3://carbide/${{ github.ref_name }}/
+          aws s3 cp --no-progress harvester-carbide-arm64.tar.zst s3://carbide/${{ github.ref_name }}/
 
       - name: Upload Gitea
         run: |
-          source ~/.bashrc
-          aws s3 cp hauler/gitea/gitea-carbide.tar.zst s3://carbide/${{ github.ref_name }}/
-          aws s3 ls s3://carbide/${{ github.ref_name }}
+          cd hauler/gitea && source ~/.bashrc
+          aws s3 cp --no-progress gitea-carbide-amd64.tar.zst s3://carbide/${{ github.ref_name }}/
+          aws s3 cp --no-progress gitea-carbide-arm64.tar.zst s3://carbide/${{ github.ref_name }}/
 
       - name: Upload Kubevip
         run: |
-          source ~/.bashrc
-          aws s3 cp hauler/kubevip/kubevip-carbide.tar.zst s3://carbide/${{ github.ref_name }}/
-          aws s3 ls s3://carbide/${{ github.ref_name }}
+          cd hauler/kubevip && source ~/.bashrc
+          aws s3 cp --no-progress kubevip-carbide-amd64.tar.zst s3://carbide/${{ github.ref_name }}/
+          aws s3 cp --no-progress kubevip-carbide-arm64.tar.zst s3://carbide/${{ github.ref_name }}/
 
       - name: Upload Vault
         run: |
-          source ~/.bashrc
-          aws s3 cp hauler/vault/vault-carbide.tar.zst s3://carbide/${{ github.ref_name }}/
-          aws s3 ls s3://carbide/${{ github.ref_name }}
+          cd hauler/vault && source ~/.bashrc
+          aws s3 cp --no-progress vault-carbide-amd64.tar.zst s3://carbide/${{ github.ref_name }}/
+          aws s3 cp --no-progress vault-carbide-arm64.tar.zst s3://carbide/${{ github.ref_name }}/
 
       - name: Upload Private
         run: |
-          source ~/.bashrc
-          aws s3 cp hauler/carbide/carbide-carbide.tar.zst s3://carbide/${{ github.ref_name }}/
-          aws s3 ls s3://carbide/${{ github.ref_name }}
+          cd hauler/carbide && source ~/.bashrc
+          aws s3 cp --no-progress carbide-carbide-amd64.tar.zst s3://carbide/${{ github.ref_name }}/
+          aws s3 cp --no-progress carbide-carbide-arm64.tar.zst s3://carbide/${{ github.ref_name }}/