Merge branch 'master' of https://github.com/mikeoliphant/StompboxUI

mikeoliphant · Jul 1, 2024 · f2ac6db · f2ac6db
2 parents f7f8f33 + cfdd3d0
commit f2ac6db
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 5 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -34,8 +34,8 @@ jobs:
       working-directory: ${{github.workspace}}
       run: msbuild .\StompboxUI.sln /t:StompboxPlugin /p:Configuration=Release
 
-    - name: Create Plugin Archive
-      uses: actions/upload-artifact@v1
+    - name: Create Plugin Artifact
+      uses: actions/upload-artifact@v4
       with:
         name: StompboxVST3Plugin
         path: ${{github.workspace}}\StompboxPlugin\bin\Release\net8.0-windows
@@ -44,8 +44,8 @@ jobs:
       working-directory: ${{github.workspace}}
       run: msbuild .\StompboxUI.sln /t:StompboxRemote /p:Configuration=Release
 
-    - name: Create Windows Remote Archive
-      uses: actions/upload-artifact@v1
+    - name: Create Windows Remote Artifact
+      uses: actions/upload-artifact@v4
       with:
         name: StompboxRemote
         path: ${{github.workspace}}\StompboxRemote\bin\Release\net8.0-windows
@@ -57,4 +57,13 @@ jobs:
         java-version: '17'
 
     - name: run MSBuild for Android Remote
-      run: msbuild .\StompboxAndroid\StompboxAndroid.csproj /t:PackageForAndroid /p:Configuration=Debug
+      run: |
+        echo -n ${{ secrets.KEYSTORE }} | base64 --ignore-garbage --decode > ${{github.workspace}}\android.keystore
+        msbuild .\StompboxAndroid\StompboxAndroid.csproj /p:Configuration=RELEASE /p:AndroidKeyStore=true /p:AndroidSigningKeyAlias=stompboxkeystore  /p:AndroidSigningKeyStore="${{github.workspace}}\android.keystore" /p:AndroidSigningKeyPass="${{ secrets.KEYSTORE_PASS }}" /p:AndroidSigningStorePass="${{ secrets.KEYSTORE_PASS }}"
+      
+    - name: Create Android Remote Artifact
+      uses: actions/upload-artifact@v4
+      with:
+        name: AndroidRemote
+        path: ${{github.workspace}}\StompboxAndroid\bin\Release\net8.0-android\StompboxAndroid.StompboxAndroid-Signed.apk
+
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -84,3 +84,24 @@ jobs:
         asset_path: ./StompboxRemote.zip
         asset_name: StompboxRemote.zip
         asset_content_type: application/zip        
+
+    - name: Setup Java
+      uses: actions/setup-java@v3
+      with:
+        distribution: 'microsoft'
+        java-version: '17'
+
+    - name: run MSBuild for Android Remote
+      run: |
+        echo -n ${{ secrets.KEYSTORE }} | base64 --ignore-garbage --decode > ${{github.workspace}}\android.keystore
+        msbuild .\StompboxAndroid\StompboxAndroid.csproj /p:Configuration=RELEASE /p:AndroidKeyStore=true /p:AndroidSigningKeyAlias=stompboxkeystore  /p:AndroidSigningKeyStore="${{github.workspace}}\android.keystore" /p:AndroidSigningKeyPass="${{ secrets.KEYSTORE_PASS }}" /p:AndroidSigningStorePass="${{ secrets.KEYSTORE_PASS }}"
+
+    - name: Upload Android Remote Asset
+      uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ needs.create_release.outputs.upload_url }}
+        asset_path: ${{github.workspace}}\StompboxAndroid\bin\Release\net8.0-android\StompboxAndroid.StompboxAndroid-Signed.apk
+        asset_name: StompboxAndroid.StompboxAndroid-Signed.apk
+        asset_content_type: application/zip