repush

Author: vmsaif

.github/workflows/main.yml

@@ -41,9 +41,9 @@ jobs:
         tag_name: ${{ github.ref }}
         release_name: Release ${{ github.ref }}
 
-  windows_build:
+  macos_build:
     needs: build
-    runs-on: windows-latest
+    runs-on: macOS-latest
 
     steps:
     - name: Checkout code
@@ -54,43 +54,7 @@ jobs:
       with:
         name: ${{ env.FILE_NAME }}-jar-${{ env.VERSION }}
         path: ${{ env.OUT_DIR }}
-
-    - name: Setup Java 16
-      uses: actions/setup-java@v2
-      with:
-        java-version: '16'
-        distribution: 'temurin'
-
-    - name: Create Standalone for Windows
-      run: jpackage --input ${{ env.OUT_DIR }} --name ${{ env.FILE_NAME }} --main-jar ${{ env.FILE_NAME }}-${{ env.VERSION }}.jar --main-class src.App --type exe --dest .
-      
-    - name: List contents of out directory (Windows)
-      run: Get-ChildItem -Path ${{ env.OUT_DIR }}
 
-
-    - name: Rename Windows standalone
-      run: move ${{ env.OUT_DIR }}/${{ env.FILE_NAME }}-${{ env.VERSION }}.jar ${{ env.OUT_DIR }}/${{ env.FILE_NAME }}-Windows-${{ env.VERSION }}.exe
-
-    - name: Attach Windows Standalone to Release
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ needs.build.outputs.release_upload_url }}
-        asset_path: ${{ env.OUT_DIR }}/${{ env.FILE_NAME }}-Windows-${{ env.VERSION }}.exe
-        asset_name: ${{ env.FILE_NAME }}-Windows-${{ env.VERSION }}.exe
-        asset_content_type: application/octet-stream
-
-  macos_build:
-    needs: build
-    runs-on: macOS-latest
-
-    steps:
-    - name: Checkout code
-      uses: actions/checkout@v2
-
-
-
     - name: Create Standalone for MacOS
       run: jpackage --input ${{ env.OUT_DIR }} --name ${{ env.FILE_NAME }} --main-jar ${{ env.FILE_NAME }}-${{ env.VERSION }}.jar --main-class src.App --type dmg --dest .
 
@@ -118,8 +82,12 @@ jobs:
     - name: Checkout code
       uses: actions/checkout@v2
 
-
-    
+    - name: Download JAR from artifact
+      uses: actions/download-artifact@v2
+      with:
+        name: ${{ env.FILE_NAME }}-jar-${{ env.VERSION }}
+        path: ${{ env.OUT_DIR }}
+        
     - name: Create Standalone for Ubuntu
       run: jpackage --input ${{ env.OUT_DIR }} --name ${{ env.FILE_NAME }} --main-jar ${{ env.FILE_NAME }}-${{ env.VERSION }}.jar --main-class src.App --type deb --dest .
 
@@ -138,3 +106,45 @@ jobs:
         asset_path: ./${{ env.FILE_NAME }}-Ubuntu-${{ env.VERSION }}_amd64.deb
         asset_name: ${{ env.FILE_NAME }}-Ubuntu-${{ env.VERSION }}_amd64.deb
         asset_content_type: application/octet-stream
+
+  windows_build:
+    needs: build
+    runs-on: windows-latest
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v2
+
+    - name: Download JAR from artifact
+      uses: actions/download-artifact@v2
+      with:
+        name: ${{ env.FILE_NAME }}-jar-${{ env.VERSION }}
+        path: ${{ env.OUT_DIR }}
+
+    - name: Setup Java 16
+      uses: actions/setup-java@v2
+      with:
+        java-version: '16'
+        distribution: 'temurin'
+
+    - name: Create Standalone for Windows
+      run: jpackage --input ${{ env.OUT_DIR }} --name ${{ env.FILE_NAME }} --main-jar ${{ env.FILE_NAME }}-${{ env.VERSION }}.jar --main-class src.App --type exe --dest .
+      
+    - name: List contents of out directory (Windows)
+      run: Get-ChildItem -Path ${{ env.OUT_DIR }}
+    
+
+    - name: Rename Windows standalone
+      run: move ${{ env.OUT_DIR }}/${{ env.FILE_NAME }}-${{ env.VERSION }}.jar ${{ env.OUT_DIR }}/${{ env.FILE_NAME }}-Windows-${{ env.VERSION }}.exe
+
+    - name: Attach Windows Standalone to Release
+      uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ needs.build.outputs.release_upload_url }}
+        asset_path: ${{ env.OUT_DIR }}/${{ env.FILE_NAME }}-Windows-${{ env.VERSION }}.exe
+        asset_name: ${{ env.FILE_NAME }}-Windows-${{ env.VERSION }}.exe
+        asset_content_type: application/octet-stream
+
+