From a1738c57dd52bb94b004ab21437f7378560344c0 Mon Sep 17 00:00:00 2001
From: Joseph Flinn <58369717+joseph-flinn@users.noreply.github.com>
Date: Thu, 12 Aug 2021 10:04:37 -0700
Subject: [PATCH] Cleaning up the build workflow and making sure the changes to
 the build workflow are reflected in the release workflow (#360)

---
 .github/workflows/build.yml   | 9 +--------
 .github/workflows/release.yml | 7 +------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 68f604cd38..0a1d6dec4f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -180,15 +180,9 @@ jobs:
           $env:pkgVersion = (Get-Content -Raw -Path ./package.json | ConvertFrom-Json).version
           echo "PACKAGE_VERSION=$env:pkgVersion" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
 
-      #- name: Install Snapcraft
-      #  uses: samuelmeuli/action-snapcraft@v1
-      #  with:
-      #    use_lxd: true
-
       - name: Print environment
         run: |
           whoami
-          #snapcraft --version
           echo "GitHub ref: $GITHUB_REF"
           echo "GitHub event: $GITHUB_EVENT"
           echo "BW Package Version: $PACKAGE_VERSION"
@@ -202,7 +196,7 @@ jobs:
           name: bw-linux-${{ env.PACKAGE_VERSION }}.zip
           path: ./dist/snap
 
-      - name: Build Snap Package
+      - name: Setup Snap Package
         run: |
           cp -r stores/snap/* -t dist/snap
           sed -i s/__version__/${{ env.PACKAGE_VERSION }}/g dist/snap/snapcraft.yaml
@@ -217,7 +211,6 @@ jobs:
 
       - name: Create checksum
         run: |
-          #sg lxd -c 'snapcraft --use-lxd'
           cd dist/snap
           ls -alth
           sha256sum bw_${{ env.PACKAGE_VERSION }}_amd64.snap | awk '{split($0, a); print a[1]}' > bw-snap-sha256-${{ env.PACKAGE_VERSION }}.txt
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index eeafdce0ed..390fbed041 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -263,13 +263,9 @@ jobs:
       - name: Checkout repo
         uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f  # 2.3.4
 
-      - name: Install Snapcraft
-        uses: samuelmeuli/action-snapcraft@10d7d0a84d9d86098b19f872257df314b0bd8e2d  # 1.2.0
-
       - name: Print environment
         run: |
           whoami
-          snapcraft --version
           echo "GitHub ref: $GITHUB_REF"
           echo "GitHub event: $GITHUB_EVENT"
           echo "BW Package Version: $PACKAGE_VERSION"
@@ -283,7 +279,7 @@ jobs:
           name: bw-linux-${{ env.PACKAGE_VERSION }}.zip
           path: ./dist/snap
 
-      - name: Build Snap Package
+      - name: Setup Snap Package
         run: |
           cp -r stores/snap/* -t dist/snap
           sed -i s/__version__/${{ env.PACKAGE_VERSION }}/g dist/snap/snapcraft.yaml
@@ -298,7 +294,6 @@ jobs:
 
       - name: Create checksum
         run: |
-          #sg lxd -c 'snapcraft --use-lxd'
           cd dist/snap
           ls -alth
           sha256sum bw_${{ env.PACKAGE_VERSION }}_amd64.snap | awk '{split($0, a); print a[1]}' > bw-snap-sha256-${{ env.PACKAGE_VERSION }}.txt