gradle command replaced with eskatos/gradle-command-action

Ogefest · Apr 25, 2021 · 94b3479 · 94b3479
1 parent e10d6c2
commit 94b3479
Showing 1 changed file with 58 additions and 51 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -28,10 +28,14 @@ jobs:
       run: mv build/Notepack-package/*.deb ./file.deb ; ls -lha .
     - name: Create Runtime ZIP
       run: cd build/Notepack-package/; zip -r ../../notepack.zip Notepack/ ; cd ../..
-#    - name: Create RPM
+    - name: Create RPM
+      uses: eskatos/gradle-command-action@v1
+      with:
+        gradle-version: 6.8
+        arguments: jpackage -PinstallerType=rpm
 #      run: gradle jpackage -PinstallerType=rpm
-#    - name: Rename RPM
-#      run: mv build/Notepack-package/*.rpm ./file.rpm ; ls -lha .
+    - name: Rename RPM
+      run: mv build/Notepack-package/*.rpm ./file.rpm ; ls -lha .
     - name: Download appimage
       run: wget -O appimagetool "https://github.com/AppImage/AppImageKit/releases/download/12/appimagetool-x86_64.AppImage"
     - name: Build appimage
@@ -57,15 +61,15 @@ jobs:
         asset_name: notepack-${{ github.event.release.tag_name }}-1_amd64.deb
         asset_content_type: application/octet-stream        
 
-#    - name: Upload RPM
-#      uses: actions/upload-release-asset@v1
-#      env:
-#        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-#      with:
-#        upload_url: ${{ github.event.release.upload_url }}
-#        asset_path: ./file.rpm
-#        asset_name: notepack-${{ github.event.release.tag_name }}_amd64.rpm
-#        asset_content_type: application/octet-stream
+    - name: Upload RPM
+      uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ github.event.release.upload_url }}
+        asset_path: ./file.rpm
+        asset_name: notepack-${{ github.event.release.tag_name }}_amd64.rpm
+        asset_content_type: application/octet-stream
 
     - name: Upload Linux Runtime
       uses: actions/upload-release-asset@v1
@@ -77,43 +81,46 @@ jobs:
         asset_name: notepack-${{ github.event.release.tag_name }}-linux-runtime.zip
         asset_content_type: application/octet-stream          
 
-#
-#  build-windows:
-#
-#    runs-on: windows-latest
-#
-#    steps:
-#
-#    - uses: actions/checkout@v2
-#    - name: Set up JDK 14
-#      uses: actions/setup-java@v1
-#      with:
-#        java-version: 14
-#    - name: Create MSI
+
+  build-windows:
+
+    runs-on: windows-latest
+
+    steps:
+
+    - uses: actions/checkout@v2
+    - name: Set up JDK 14
+      uses: actions/setup-java@v1
+      with:
+        java-version: 14
+    - name: Create MSI
+      uses: eskatos/gradle-command-action@v1
+      with:
+        gradle-version: 6.8
+        arguments: jpackage -PinstallerType=msi
 #      run: gradle jpackage -PinstallerType=msi
-#    - name: Rename MSI
-#      run: ls build/Notepack-package ; mv build/Notepack-package/*.msi ./file.msi
-#
-#    - name: Create zip runtime
-#      run: cd build/Notepack-package/; 7z a ../../notepack.zip Notepack/ ; cd ../..
-#
-#    - name: Upload Windows Runtime
-#      uses: actions/upload-release-asset@v1
-#      env:
-#        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-#      with:
-#        upload_url: ${{ github.event.release.upload_url }}
-#        asset_path: ./notepack.zip
-#        asset_name: notepack-${{ github.event.release.tag_name }}-windows-runtime.zip
-#        asset_content_type: application/octet-stream
-#
-#    - name: Upload Windows Msi
-#      uses: actions/upload-release-asset@v1
-#      env:
-#        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-#      with:
-#        upload_url: ${{ github.event.release.upload_url }}
-#        asset_path: ./file.msi
-#        asset_name: notepack-${{ github.event.release.tag_name }}-windows-installer.msi
-#        asset_content_type: application/octet-stream
-#
+    - name: Rename MSI
+      run: ls build/Notepack-package ; mv build/Notepack-package/*.msi ./file.msi
+
+    - name: Create zip runtime
+      run: cd build/Notepack-package/; 7z a ../../notepack.zip Notepack/ ; cd ../..
+
+    - name: Upload Windows Runtime
+      uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ github.event.release.upload_url }}
+        asset_path: ./notepack.zip
+        asset_name: notepack-${{ github.event.release.tag_name }}-windows-runtime.zip
+        asset_content_type: application/octet-stream
+
+    - name: Upload Windows Msi
+      uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ github.event.release.upload_url }}
+        asset_path: ./file.msi
+        asset_name: notepack-${{ github.event.release.tag_name }}-windows-installer.msi
+        asset_content_type: application/octet-stream