From 1fc6162dea3ffd97fca0848dca5fc07da2ab800b Mon Sep 17 00:00:00 2001
From: Vlad Shcherban <vlad@coronalabs.com>
Date: Wed, 22 Dec 2021 08:12:13 +0200
Subject: [PATCH] Maintenance

minor build script fixes
---
 .github/workflows/build.yml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 840a74279..f100e7c5d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -529,6 +529,7 @@ jobs:
     runs-on: ubuntu-20.04
     needs:
       - linux
+      - release
     steps:
       - uses: actions/download-artifact@v1
         with:
@@ -542,12 +543,12 @@ jobs:
             export SNAP_RELEASE=stable
           fi
           echo "SNAP_RELEASE=$SNAP_RELEASE" >> $GITHUB_ENV
-          mv -v Snap/*.snap s2d.snap
+          find Snap -name '*.snap' -execdir mv -v {} s2d.snap \; -quit
       - uses: snapcore/action-publish@v1
-        if: false
+        continue-on-error: true
         with:
           store_login: ${{ secrets.SNAP_STORE_LOGIN }}
-          snap: s2d.snap
+          snap: ./Snap/s2d.snap
           release: ${{ env.SNAP_RELEASE }}
 
 
@@ -607,6 +608,7 @@ jobs:
       - uses: actions/download-artifact@v1
         with:
           name: Snap
+      - run: find Snap -name '*.snap' -execdir mv -v {} s2d.snap \; -quit
       - name: Create Release
         id: create_release
         uses: actions/create-release@v1
@@ -640,8 +642,8 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./Snap/solar2d_${{ env.YEAR }}.${{ env.BUILD }}.snap
-          asset_name: Solar2D-Linux-${{ env.YEAR }}.${{ env.BUILD }}.snap
+          asset_path: ./Snap/s2d.snap
+          asset_name: Solar2D-Linux-${{ env.YEAR }}.${{ env.BUILD }}_amd64.snap
           asset_content_type: application/octet-stream
       - name: Upload Release Asset for Linux Simulator Binaries
         uses: actions/upload-release-asset@v1