From 5016f0af7141d7153141091fbbdc21285911b7e1 Mon Sep 17 00:00:00 2001
From: Brendan Allan <brendonovich@outlook.com>
Date: Wed, 4 May 2022 20:42:26 +0800
Subject: [PATCH 1/2] ci: fix short github sha

---
 .../actions/publish-desktop-artifacts/action.yaml    | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/.github/actions/publish-desktop-artifacts/action.yaml b/.github/actions/publish-desktop-artifacts/action.yaml
index 3dbd296d5..fd54bed43 100644
--- a/.github/actions/publish-desktop-artifacts/action.yaml
+++ b/.github/actions/publish-desktop-artifacts/action.yaml
@@ -8,23 +8,29 @@ runs:
       shell: bash
       run: chmod +x ./target/release/bundle/appimage/spacedrive*.AppImage
 
+    - name: Determine short GitHub SHA
+      shell: bash
+      run: |
+        export GITHUB_SHA_SHORT=$(git rev-parse --short "$GITHUB_SHA")
+        echo "GITHUB_SHA_SHORT=$GITHUB_SHA_SHORT" >> $GITHUB_ENV
+
     - name: Publish artifacts (AppImage)
       if: matrix.platform == 'ubuntu-latest'
       uses: actions/upload-artifact@v3
       with:
-        name: Spacedrive-AppImage-${{ GITHUB_SHA::8 }}
+        name: Spacedrive-AppImage-${{ env.GITHUB_SHA_SHORT }}
         path: ./target/release/bundle/appimage/spacedrive*.AppImage
 
     - name: Publish artifacts (Windows)
       if: matrix.platform == 'windows-latest'
       uses: actions/upload-artifact@v3
       with:
-        name: Spacedrive-Windows-${{ GITHUB_SHA::8 }}
+        name: Spacedrive-Windows-${{ env.GITHUB_SHA_SHORT }}
         path: .\target\release\bundle\msi\*.msi
 
     - name: Publish artifacts (macOS)
       if: matrix.platform == 'macos-latest'
       uses: actions/upload-artifact@v3
       with:
-        name: Spacedrive-macOS-${{ GITHUB_SHA::8 }}
+        name: Spacedrive-macOS-${{ env.GITHUB_SHA_SHORT }}
         path: ./target/release/bundle/macos/*.app

From 87279dfc13180840302d3423756acca5043cf6ef Mon Sep 17 00:00:00 2001
From: Brendan Allan <brendonovich@outlook.com>
Date: Wed, 4 May 2022 20:42:38 +0800
Subject: [PATCH 2/2] ci: install libswresample-dev

---
 .github/actions/install-deps/action.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/actions/install-deps/action.yaml b/.github/actions/install-deps/action.yaml
index 1e684bbc1..320f2a92f 100644
--- a/.github/actions/install-deps/action.yaml
+++ b/.github/actions/install-deps/action.yaml
@@ -17,6 +17,7 @@ runs:
           libavresample-dev \
           libavutil-dev \
           libswscale-dev \
+          libswresample-dev \
           ffmpeg \
           libgtk-3-dev \
           webkit2gtk-4.0 \