During release, make available a portable version too, fixes

LiveEnhancementSuite · Apr 12, 2020 · c7e1a5f · c7e1a5f
1 parent 6ef283b
commit c7e1a5f
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 32 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -23,13 +23,3 @@ jobs:
       run: |
         $InnoSetupCmdLocation="C:\Program Files (x86)\Inno Setup 6\ISCC.exe"
         & $InnoSetupCmdLocation /q innoSetupScript.iss
-    - name: Copy and prepare for upload
-      run: |
-        mkdir BuildResult
-        copy "Live Enhancement Suite.exe" "BuildResult\Live Enhancement Suite.exe"
-        copy "Output\LiveEnhancementSuiteSetup-x64.exe" BuildResult\LiveEnhancementSuiteSetup-x64.exe
-    - name: Upload binary, installer and checksum as artifact
-      uses: actions/upload-artifact@v1.0.0
-      with:
-        name: 'Build Result'
-        path: BuildResult\
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -21,30 +21,31 @@ jobs:
       run: |
         curl http://files.jrsoftware.org/is/6/innosetup-6.0.4.exe -o innosetup-6.0.4.exe
         ./innosetup-6.0.4.exe /VERYSILENT /SUPPRESSMSGBOXES
-    - name: Run Inno Setup script to generate installer
+    - name: Run Inno Setup script and generate checksums
       run: |
         $InnoSetupCmdLocation="C:\Program Files (x86)\Inno Setup 6\ISCC.exe"
         & $InnoSetupCmdLocation /q innoSetupScript.iss
         CertUtil -hashfile .\Output\LiveEnhancementSuiteSetup-x64.exe SHA256 | Select -SkipLast 1 >> chksm
         (Get-Content chksm) -join ' ' >> .\Output\CHECKSUM.txt
-        Compress-Archive -LiteralPath .\Output\LiveEnhancementSuiteSetup-x64.exe .\Output\CHECKSUM.txt -DestinationPath .\LiveEnhancementSuiteSetup-x64.zip
-    - name: Create Release
-      id: create_release
-      uses: actions/create-release@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        Compress-Archive -LiteralPath .\Output\LiveEnhancementSuiteSetup-x64.exe, .\Output\CHECKSUM.txt -DestinationPath .\LiveEnhancementSuiteSetup-x64.zip
+        Remove-Item chksm
+        CertUtil -hashfile "Live Enhancement Suite.exe" SHA256 | Select -SkipLast 1 >> chksm
+        (Get-Content chksm) -join ' ' >> CHECKSUM.txt
+        Compress-Archive -LiteralPath "Live Enhancement Suite.exe", CHECKSUM.txt -DestinationPath .\LiveEnhancementSuitePortable-x64.zip
+    - name: Upload binaries to release
+      uses: svenstaro/upload-release-action@v1-release
       with:
-        tag_name: ${{ github.ref }}
-        release_name: Release ${{ github.ref }}
-        draft: false
-        prerelease: false
-    - name: Upload Release Asset
-      id: upload-release-asset 
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.create_release.outputs.upload_url }}
-        asset_path: .\LiveEnhancementSuiteSetup-x64.zip
+        repo_token: ${{ secrets.GITHUB_TOKEN }}
+        file: .\LiveEnhancementSuiteSetup-x64.zip
         asset_name: LiveEnhancementSuiteSetup-x64.zip
-        asset_content_type: application/zip
+        tag: ${{ github.ref }}
+        overwrite: true
+    - name: Upload portable version to release
+      uses: svenstaro/upload-release-action@v1-release
+      with:
+        repo_token: ${{ secrets.GITHUB_TOKEN }}
+        file: .\LiveEnhancementSuitePortable-x64.zip
+        asset_name: LiveEnhancementSuitePortable-x64.zip
+        tag: ${{ github.ref }}
+        overwrite: true
+
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-![Live Enhancement Suite](https://raw.githubusercontent.com/itsbartsimpson/LESforMacOS/master/Hammerspoon/Images.xcassets/AppIcon.appiconset/icon_256x256.png)
+![Live Enhancement Suite](https://raw.githubusercontent.com/LiveEnhancementSuite/LESforMacOS/master/Hammerspoon/Images.xcassets/AppIcon.appiconset/icon_256x256.png)
 
 [![Build Status](https://img.shields.io/endpoint.svg?url=https%3A%2F%2Factions-badge.atrox.dev%2FLiveEnhancementSuite%2FLESforWindows%2Fbadge%3Fref%3Dmaster&style=flat)](https://actions-badge.atrox.dev/LiveEnhancementSuite/LESforWindows/goto?ref=master)
 
@@ -9,7 +9,7 @@ The Live Enhancement Suite is a self-managing compiled [AutoHotKey](https://www.
 ## Sounds cool, how can I help?
 
 * Read our [Code of Conduct](https://github.com/LiveEnhancementSuite/LESforMacOS/blob/master/CODE_OF_CONDUCT.md) and get started contributing to the Live Enhancement Suite
-* Dig your pennies from the couch and help fund the development of LES with [PayPal](https://paypal.me/enhancementsuite)
+* Dig some pennies from the couch and help fund the development of LES with [PayPal](https://paypal.me/enhancementsuite)
 
 ## How do I build this thing?