Set image name outside the build script (#60)

.github/workflows/on-push.yml

@@ -34,8 +34,15 @@ jobs:
               echo '{"experimental": true}' | sudo tee -a /etc/docker/daemon.json
               sudo systemctl restart docker
 
+        - name: Set image name
+          run: |
+              IMAGE_NAME="umbrel-os-$(git describe --tags)"
+              echo "::set-env name=IMAGE_NAME::$IMAGE_NAME"
+
         - name: Run build script
-          run: sudo ./build.sh
+          run: |
+              echo "Building $IMAGE_NAME"
+              sudo IMG_FILENAME=$IMAGE_NAME ZIP_FILENAME=$IMAGE_NAME ./build.sh
 
         - name: Copy ZIP to current working dir
           run: cp deploy/*.zip ./
@@ -46,4 +53,5 @@ jobs:
         - name: Upload artifact
           uses: actions/upload-artifact@v2
           with:
-            path: umbrel-*.zip
+            path: ${{ env.IMAGE_NAME }}.zip
+            name: ${{ env.IMAGE_NAME }}.zip

.github/workflows/on-tag-only.yml

@@ -37,9 +37,16 @@ jobs:
                 sudo rm -rf /etc/docker/daemon.json
                 echo '{"experimental": true}' | sudo tee -a /etc/docker/daemon.json
                 sudo systemctl restart docker
+        
+        - name: Set image name
+          run: |
+                IMAGE_NAME="umbrel-os-$(git describe --tags)"
+                echo "::set-env name=IMAGE_NAME::$IMAGE_NAME"
 
         - name: Run build script
-          run: sudo ./build.sh
+          run: |
+                echo "Building $IMAGE_NAME"
+                sudo IMG_FILENAME=$IMAGE_NAME ZIP_FILENAME=$IMAGE_NAME ./build.sh
 
         - name: Copy ZIP to current working dir
           run: cp deploy/*.zip ./
@@ -65,5 +72,6 @@ jobs:
             GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           with:
             upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps 
-            asset_path: umbrel-*.zip
+            asset_path: ${{ env.IMAGE_NAME }}.zip
+            asset_name: ${{ env.IMAGE_NAME }}.zip
             asset_content_type: application/gzip

build.sh

@@ -151,16 +151,10 @@ if [ -z "${IMG_NAME}" ]; then
 	exit 1
 fi
 
-
-TAG=""
-if git rev-parse --is-inside-work-tree > /dev/null 2>&1; then
-	TAG="-$(git describe --tags)"
-fi
-
 export USE_QEMU="${USE_QEMU:-0}"
 export IMG_DATE="${IMG_DATE:-"$(date +%Y-%m-%d)"}"
-export IMG_FILENAME="${IMG_FILENAME:-"${IMG_DATE}-${IMG_NAME}${TAG}"}"
-export ZIP_FILENAME="${ZIP_FILENAME:-"${IMG_NAME}${TAG}"}"
+export IMG_FILENAME="${IMG_FILENAME:-"${IMG_DATE}-${IMG_NAME}"}"
+export ZIP_FILENAME="${ZIP_FILENAME:-"${IMG_NAME}"}"
 
 export SCRIPT_DIR="${BASE_DIR}/scripts"
 export WORK_DIR="${WORK_DIR:-"${BASE_DIR}/work/${IMG_DATE}-${IMG_NAME}"}"