Refactor file naming and upload process for Android, Linux, and Windo…

…ws builds
sanjay7178 · Aug 22, 2024 · ed19faf · ed19faf
1 parent 993ada0
commit ed19faf
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 19 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -43,19 +43,19 @@ jobs:
 
     - name: Rename APK files
       run: |
-        mv fyne-cross/dist/android/${{ env.APP_NAME }}.apk fyne-cross/dist/android/${{ env.APP_NAME }}_${{ github.ref_name }}.apk
-        mv fyne-cross/dist/android-386/${{ env.APP_NAME }}.apk fyne-cross/dist/android-386/${{ env.APP_NAME }}_${{ github.ref_name }}.apk
-        mv fyne-cross/dist/android-amd64/${{ env.APP_NAME }}.apk fyne-cross/dist/android-amd64/${{ env.APP_NAME }}_${{ github.ref_name }}.apk
-        mv fyne-cross/dist/android-arm/${{ env.APP_NAME }}.apk fyne-cross/dist/android-arm/${{ env.APP_NAME }}_${{ github.ref_name }}.apk
-        mv fyne-cross/dist/android-arm64/${{ env.APP_NAME }}.apk fyne-cross/dist/android-arm64/${{ env.APP_NAME }}_${{ github.ref_name }}.apk
+        mv fyne-cross/dist/android/${{ env.APP_NAME }}.apk fyne-cross/dist/android/${{ env.APP_NAME }}_${{ github.ref_name }}_universal.apk
+        mv fyne-cross/dist/android-386/${{ env.APP_NAME }}.apk fyne-cross/dist/android-386/${{ env.APP_NAME }}_${{ github.ref_name }}_386.apk
+        mv fyne-cross/dist/android-amd64/${{ env.APP_NAME }}.apk fyne-cross/dist/android-amd64/${{ env.APP_NAME }}_${{ github.ref_name }}_amd64.apk
+        mv fyne-cross/dist/android-arm/${{ env.APP_NAME }}.apk fyne-cross/dist/android-arm/${{ env.APP_NAME }}_${{ github.ref_name }}_arm.apk
+        mv fyne-cross/dist/android-arm64/${{ env.APP_NAME }}.apk fyne-cross/dist/android-arm64/${{ env.APP_NAME }}_${{ github.ref_name }}_arm64.apk
 
     - name: Create Release
       uses: softprops/action-gh-release@v1
       with:
         files: |
-          fyne-cross/dist/android/${{ env.APP_NAME }}_${{ github.ref_name }}.apk
-          fyne-cross/dist/android-386/${{ env.APP_NAME }}_${{ github.ref_name }}.apk
-          fyne-cross/dist/android-amd64/${{ env.APP_NAME }}_${{ github.ref_name }}.apk
-          fyne-cross/dist/android-arm/${{ env.APP_NAME }}_${{ github.ref_name }}.apk
-          fyne-cross/dist/android-arm64/${{ env.APP_NAME }}_${{ github.ref_name }}.apk
+          fyne-cross/dist/android/${{ env.APP_NAME }}_${{ github.ref_name }}_universal.apk
+          fyne-cross/dist/android-386/${{ env.APP_NAME }}_${{ github.ref_name }}_386.apk
+          fyne-cross/dist/android-amd64/${{ env.APP_NAME }}_${{ github.ref_name }}_amd64.apk
+          fyne-cross/dist/android-arm/${{ env.APP_NAME }}_${{ github.ref_name }}_arm.apk
+          fyne-cross/dist/android-arm64/${{ env.APP_NAME }}_${{ github.ref_name }}_arm64.apk
         token: ${{ secrets.TOKEN }}
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -22,7 +22,7 @@ jobs:
       run: go install github.com/fyne-io/fyne-cross@latest
 
     - name: Build for Linux
-      run: fyne-cross linux -arch=amd64
+      run: fyne-cross linux -arch=amd64,arm64
 
     - name: Read TOML and set env vars
       run: |
@@ -38,11 +38,15 @@ jobs:
 
     - name: Rename tar.xz file
       run: |
-        mv fyne-cross/dist/linux-amd64/${{ env.APP_NAME }}.tar.xz fyne-cross/dist/linux-amd64/${{ env.APP_NAME }}_${{ github.ref_name }}.tar.xz
+        mv fyne-cross/dist/linux-amd64/${{ env.APP_NAME }}.tar.xz fyne-cross/dist/linux-amd64/${{ env.APP_NAME }}_${{ github.ref_name }}_amd64.tar.xz
+        mv fyne-cross/dist/linux-arm64/${{ env.APP_NAME }}.tar.xz fyne-cross/dist/linux-amd64/${{ env.APP_NAME }}_${{ github.ref_name }}_arm64.tar.xz
+
 
     
     - name: Upload to Release
       uses: softprops/action-gh-release@v1
       with:
-        files: fyne-cross/dist/linux-amd64/${{ env.APP_NAME }}_${{ github.ref_name }}.tar.xz
+        files: |
+          fyne-cross/dist/linux-amd64/${{ env.APP_NAME }}_${{ github.ref_name }}_amd64.tar.xz
+          fyne-cross/dist/linux-amd64/${{ env.APP_NAME }}_${{ github.ref_name }}_arm64.tar.xz
         token: ${{ secrets.TOKEN }}
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -39,17 +39,17 @@ jobs:
 
     - name: Rename exe file
       run: |
-        mv fyne-cross/dist/windows-amd64/${{ env.APP_NAME }}.exe fyne-cross/dist/windows-amd64/${{ env.APP_NAME }}_${{ github.ref_name }}.exe
-        mv fyne-cross/dist/windows-386/${{ env.APP_NAME }}.exe fyne-cross/dist/windows-386/${{ env.APP_NAME }}_${{ github.ref_name }}.exe
-        mv fyne-cross/dist/windows-arm64/${{ env.APP_NAME }}.exe fyne-cross/dist/windows-arm64/${{ env.APP_NAME }}_${{ github.ref_name }}.exe
+        mv fyne-cross/dist/windows-amd64/${{ env.APP_NAME }}.exe fyne-cross/dist/windows-amd64/${{ env.APP_NAME }}_${{ github.ref_name }}_amd64.exe
+        mv fyne-cross/dist/windows-386/${{ env.APP_NAME }}.exe fyne-cross/dist/windows-386/${{ env.APP_NAME }}_${{ github.ref_name }}_386.exe
+        mv fyne-cross/dist/windows-arm64/${{ env.APP_NAME }}.exe fyne-cross/dist/windows-arm64/${{ env.APP_NAME }}_${{ github.ref_name }}_arm64.exe
       
 
     - name: Upload to Release
       uses: softprops/action-gh-release@v1
       with:
         files: | 
-          fyne-cross/dist/windows-amd64/${{ env.APP_NAME }}_${{ github.ref_name }}.exe
-          fyne-cross/dist/windows-386/${{ env.APP_NAME }}_${{ github.ref_name }}.exe
-          fyne-cross/dist/windows-arm64/${{ env.APP_NAME }}_${{ github.ref_name }}.exe
+          fyne-cross/dist/windows-amd64/${{ env.APP_NAME }}_${{ github.ref_name }}_amd64.exe
+          fyne-cross/dist/windows-386/${{ env.APP_NAME }}_${{ github.ref_name }}_386.exe
+          fyne-cross/dist/windows-arm64/${{ env.APP_NAME }}_${{ github.ref_name }}_arm64.exe
         token: ${{ secrets.TOKEN }}