From 58621fd265962766668d656c3a80e97203bb5ecf Mon Sep 17 00:00:00 2001
From: Joseph Flinn <joseph.s.flinn@gmail.com>
Date: Thu, 28 Jan 2021 16:42:01 +0000
Subject: [PATCH] switching back to the artifact download task since the
 release won't be published yet

---
 .github/workflows/build.yml   |  3 +--
 .github/workflows/release.yml | 24 +++++++++++++-----------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ac9d24f6fe..5555a24096 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -204,8 +204,7 @@ jobs:
 
       - name: Build Snap Package
         run: |
-          mkdir -p dist
-          cp -r stores/snap -t dist
+          cp -r stores/snap/* -t dist/snap
           sed -i s/__version__/${{ env.PACKAGE_VERSION }}/g dist/snap/snapcraft.yaml
           
           cd dist/snap
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index e754471be3..ec65f4f8df 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -151,6 +151,12 @@ jobs:
           checksum -f="./dist/bw-linux-${env:PACKAGE_VERSION}.zip" `
             -t sha256 | Out-File -Encoding ASCII ./dist/bw-linux-sha256-${env:PACKAGE_VERSION}.txt
 
+      - name: build artifact - linux zip
+        uses: actions/upload-artifact@v2
+        with:
+          name: bw-linux-${{ env.PACKAGE_VERSION }}.zip
+          path: ./dist/bw-linux-${{ env.PACKAGE_VERSION }}.zip
+
       - name: upload windows zip release asset
         id: upload-windows-zip
         uses: actions/upload-release-asset@v1
@@ -255,25 +261,21 @@ jobs:
           GITHUB_REF: ${{ github.ref }}
           GITHUB_EVENT: ${{ github.event_name }}
 
-      - name: Get snap release asset
-        uses: dsaltares/fetch-gh-release-asset@0.0.5
-        with:
-          version: tags/${{ env.TAG_VERSION }}
-          file: bw-linux-${{ env.PACKAGE_VERSION }}.zip
-        env:
-          TAG_VERSION: ${{ needs.setup.outputs.tag_version }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
       - name: move assets
         run: |
           echo "Hopefully this is temporary until release 0.0.6 of the fetch-gh-release-asset is released"
           mkdir dist
           mv bw_${{ env.PACKAGE_VERSION }}_amd64.snap -t dist
 
+      - name: get linux zip artifact
+        uses: actions/download-artifact@v2
+        with:
+          name: bw-linux-${{ env.PACKAGE_VERSION }}.zip
+          path: ./dist/snap
+
       - name: Build Snap Package
         run: |
-          mkdir -p dist
-          cp -r stores/snap -t dist
+          cp -r stores/snap/* -t dist/snap
           sed -i s/__version__/${{ env.PACKAGE_VERSION }}/g dist/snap/snapcraft.yaml
           
           cd dist/snap