From 4b618f9b25c33bafbb43b33a24c7e018c7649f4c Mon Sep 17 00:00:00 2001
From: Romein van Buren <romein@vburen.nl>
Date: Sat, 3 Jun 2023 10:26:17 +0200
Subject: [PATCH] CI: correct upload artifact step

---
 .github/workflows/ci.yml | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 406ff71..7aa009a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -45,40 +45,48 @@ jobs:
         cache-dependency-path: frontend/package-lock.json
 
     - name: Cross-compile Rolens for Windows
+      if: matrix.platform == 'windows-2022'
       run: |
         mkdir releases
         wails build -platform windows/amd64
-        tar -czvf releases\rolens-${{ matrix.platform }}-amd64.tar.gz --directory build\bin Rolens.exe
+        tar -czvf releases\rolens-windows-10+-amd64.tar.gz --directory build\bin Rolens.exe
+        "tar_amd64=releases/rolens-windows-10+-amd64.tar.gz" >> $env:GITHUB_ENV
         rmdir build\bin
         wails build -platform windows/arm64
-        tar -czvf releases\rolens-${{ matrix.platform }}-arm64.tar.gz --directory build\bin Rolens.exe
+        tar -czvf releases\rolens-windows-10+-arm64.tar.gz --directory build\bin Rolens.exe
+        "tar_amd64=releases/rolens-windows-10+-arm64.tar.gz" >> $env:GITHUB_ENV
 
     - name: Cross-compile Rolens for Darwin
+      if: matrix.platform == 'macos-12'
       run: |
         mkdir releases
         wails build -platform darwin/amd64
-        tar -czvf releases/rolens-${{ matrix.platform }}-amd64.tar.gz --directory build/bin Rolens.app
+        tar -czvf releases/rolens-macos-10.13+-amd64.tar.gz --directory build/bin Rolens.app
+        echo "tar_amd64=releases/rolens-macos-10.13+-amd64.tar.gz" >> "$GITHUB_ENV"
         rm -rf build/bin
         wails build -platform darwin/arm64
-        tar -czvf releases/rolens-${{ matrix.platform }}-arm64.tar.gz --directory build/bin Rolens.app
+        tar -czvf releases/rolens-11.0+-arm64.tar.gz --directory build/bin Rolens.app
+        echo "tar_amd64=releases/releases/rolens-11.0+-arm64.tar.gz" >> "$GITHUB_ENV"
 
     - name: Cross-compile Rolens for Linux
       run: |
         mkdir releases
         wails build -platform darwin/amd64
-        tar -czvf releases/rolens-${{ matrix.platform }}-amd64.tar.gz --directory build/bin Rolens
+        tar -czvf releases/rolens-linux-amd64.tar.gz --directory build/bin Rolens
+        echo "tar_amd64=releases/rolens-linux-amd64.tar.gz" >> "$GITHUB_ENV"
         rm -rf build/bin
         wails build -platform windows/arm64
-        tar -czvf releases/rolens-${{ matrix.platform }}-arm64.tar.gz --directory build/bin Rolens
+        tar -czvf releases/rolens-linux-arm64.tar.gz --directory build/bin Rolens
+        echo "tar_arm64=releases/rolens-linux-arm64.tar.gz" >> "$GITHUB_ENV"
 
     - name: Upload generated amd64 binary
       uses: actions/upload-artifact@v2
       with:
-        name: rolens-${{ matrix.platform }}-amd64
-        path: releases/rolens-${{ matrix.platform }}-amd64.tar.gz
+        name: ${{ env.tar_amd64 }}
+        path: releases/${{ env.tar_amd64 }}
 
     - name: Upload generated arm64 binary
       uses: actions/upload-artifact@v2
       with:
-        name: rolens-${{ matrix.platform }}-arm64
-        path: releases/rolens-${{ matrix.platform }}-arm64.tar.gz
+        name: ${{ env.tar_arm64 }}
+        path: releases/${{ env.tar_arm64 }}