From a76a2cbc731cb516c58d5057ddebdd514c038f4e Mon Sep 17 00:00:00 2001
From: Hennik Hunsaker <hennik@insidiouslogic.systems>
Date: Fri, 18 Feb 2022 06:32:06 -0700
Subject: [PATCH] Minor tweaks to fix upload

---
 .github/workflows/ci.yml |  5 +++++
 scripts/build.sh         |  8 ++++++--
 scripts/upload.sh        | 16 +++++++++++-----
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5c6e20b0..76bda2d9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -51,6 +51,9 @@ jobs:
       contents: read
     steps:
       - uses: actions/checkout@v2
+        # Grab all commits so that we get the most recent tag, too
+        with:
+          fetch-depth: 0
 
         # the default image for act doesn't include this tool, but the actual GHA environment does...
       - name: (LOCAL ONLY) Install AWS CLI
@@ -72,6 +75,8 @@ jobs:
       - name: Build
         run: |
           ./scripts/build.sh
+        env:
+          API_KEY: ${{ secrets.CORE_API_KEY }}
 
       - name: Configure AWS credentials for publication
         uses: aws-actions/configure-aws-credentials@v1
diff --git a/scripts/build.sh b/scripts/build.sh
index 84d2de37..e6ac4331 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -32,7 +32,8 @@ gox -ldflags "-s -w -X github.com/mu-box/microbox/util/odin.apiKey=$API_KEY \
 			  -X github.com/mu-box/microbox/models.microVersion=$(getCurrTag) \
 			  -X github.com/mu-box/microbox/models.microCommit=$(getCurrCommit) \
 			  -X github.com/mu-box/microbox/models.microBuild=$BUILD_DATE" \
-			  -osarch "darwin/amd64 darwin/arm64 linux/amd64 linux/arm linux/arm64 linux/s390x windows/amd64" -output="./.build/$(getTagDir)/{{.OS}}/{{.Arch}}/microbox"
+			  -osarch "darwin/amd64 darwin/arm64 linux/amd64 linux/arm linux/arm64 linux/s390x windows/amd64" \
+        -output="./.build/$(getTagDir)/{{.OS}}/{{.Arch}}/microbox"
 
 printf "\nWriting version file...\n"
 echo -n "Microbox Version $(getCurrTag)-$BUILD_DATE ($(getCurrCommit))" > ./.build/$(getTagDir)/version
@@ -40,7 +41,10 @@ echo -n "Microbox Version $(getCurrTag)-$BUILD_DATE ($(getCurrCommit))" > ./.bui
 printf "\nBuilding microbox updater...\n"
 
 # change into updater directory and build microbox updater
-cd ./updater && gox -osarch "darwin/amd64 darwin/arm64 linux/amd64 linux/arm linux/arm64 linux/s390x windows/amd64" -ldflags="-s" -output="../.build/$(getTagDir)/{{.OS}}/{{.Arch}}/microbox-update"
+cd ./updater && \
+  gox -ldflags="-s" \
+    -osarch "darwin/amd64 darwin/arm64 linux/amd64 linux/arm linux/arm64 linux/s390x windows/amd64" \
+    -output="../.build/$(getTagDir)/{{.OS}}/{{.Arch}}/microbox-update"
 
 #cd ..
 
diff --git a/scripts/upload.sh b/scripts/upload.sh
index 4a3251de..c22395ea 100755
--- a/scripts/upload.sh
+++ b/scripts/upload.sh
@@ -7,14 +7,20 @@ MD5=$(which md5 || echo "$(which md5sum) --tag" )
 echo "Generating md5s..."
 
 # look through each os/arch/file and generate an md5 for each
-for os in $(ls ./.build/v2); do
-  for arch in $(ls ./.build/v2/${os}); do
-    for file in $(ls ./.build/v2/${os}/${arch}); do
-      cat "./.build/v2/${os}/${arch}/${file}" | ${MD5} >> "./.build/v2/${os}/${arch}/${file}.md5"
+for v in $(ls ./.build); do
+  for os in $(ls ./.build/${v}); do
+    for arch in $(ls ./.build/${v}/${os}); do
+      for file in $(ls ./.build/${v}/${os}/${arch}); do
+        cat "./.build/${v}/${os}/${arch}/${file}" | ${MD5} >> "./.build/${v}/${os}/${arch}/${file}.md5"
+      done
     done
   done
 done
 
 # upload to AWS S3
 echo "Uploading builds to S3..."
-aws s3 sync ./.build/v2/ s3://tools.microbox.cloud/microbox/v2 --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers --region us-east-1
+aws s3 sync \
+  ./.build/ \
+  s3://tools.microbox.cloud/microbox \
+  --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers \
+  --region us-east-1