kusl
diff --git a/‎.github/workflows/build-and-release.yml‎
Lines changed: 123 additions & 71 deletions b/‎.github/workflows/build-and-release.yml‎
Lines changed: 123 additions & 71 deletions
@@ -1,3 +1,10 @@
+# =============================================================================
+# Build and Release Workflow
+# =============================================================================
+# Every push to master/main creates a release with version 1.0.{run_number}
+# No git tags required - uses github.run_number for automatic versioning
+# =============================================================================
+
 name: Build and Release
 
 on:
@@ -12,9 +19,9 @@ env:
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
 
 jobs:
-  # =============================================================================
-  # Build and Test (runs on every push/PR)
-  # =============================================================================
+  # ===========================================================================
+  # Build and Test
+  # ===========================================================================
   build-and-test:
     runs-on: ubuntu-latest
     steps:
@@ -37,49 +44,25 @@ jobs:
       - name: Install Android workload
         run: dotnet workload install android
 
-      - name: Setup Keystore
-        run: |
-          # Create keystore from secret, or create a dummy one for PR builds
-          if [[ -n "${{ secrets.ANDROID_KEYSTORE_BASE64 }}" ]]; then
-            echo "${{ secrets.ANDROID_KEYSTORE_BASE64 }}" | base64 -d > "$GITHUB_WORKSPACE/android.keystore"
-            echo "KEYSTORE_PATH=$GITHUB_WORKSPACE/android.keystore" >> "$GITHUB_ENV"
-            echo "SIGNING_PASSWORD=${{ secrets.ANDROID_SIGNING_PASSWORD }}" >> "$GITHUB_ENV"
-          else
-            # For PRs from forks or when secrets aren't available, create a dummy keystore
-            keytool -genkey -v -keystore "$GITHUB_WORKSPACE/android.keystore" \
-              -alias myalias -keyalg RSA -keysize 2048 -validity 1 \
-              -storepass dummypassword -keypass dummypassword \
-              -dname "CN=Dummy, OU=Dummy, O=Dummy, L=Dummy, ST=Dummy, C=US" \
-              2>/dev/null || true
-            echo "KEYSTORE_PATH=$GITHUB_WORKSPACE/android.keystore" >> "$GITHUB_ENV"
-            echo "SIGNING_PASSWORD=dummypassword" >> "$GITHUB_ENV"
-          fi
-          echo "Keystore created at: $GITHUB_WORKSPACE/android.keystore"
-          ls -la "$GITHUB_WORKSPACE/android.keystore"
-
       - name: Restore
         run: dotnet restore
 
       - name: Build
-        run: |
-          dotnet build --configuration Release --no-restore \
-            -p:BuildNumber=${{ github.run_number }} \
-            -p:AndroidKeyStore=true \
-            -p:AndroidSigningKeyStore="${{ env.KEYSTORE_PATH }}" \
-            -p:AndroidSigningStorePass="${{ env.SIGNING_PASSWORD }}" \
-            -p:AndroidSigningKeyPass="${{ env.SIGNING_PASSWORD }}" \
-            -p:AndroidSigningKeyAlias=myalias
+        run: dotnet build --configuration Release --no-restore
 
       - name: Test
-        run: dotnet test --configuration Release --no-build --verbosity normal
+        run: |
+          dotnet test --configuration Release --no-build --verbosity normal \
+            --filter "FullyQualifiedName!~Android"
 
-  # =============================================================================
-  # Build Desktop Releases
-  # =============================================================================
+  # ===========================================================================
+  # Build Desktop Binaries (Matrix)
+  # ===========================================================================
   build-desktop:
     needs: build-and-test
     if: github.event_name == 'push'
     strategy:
+      fail-fast: false
       matrix:
         include:
           - os: ubuntu-latest
@@ -119,19 +102,35 @@ jobs:
             --self-contained true \
             -p:PublishSingleFile=true \
             -p:IncludeNativeLibrariesForSelfExtract=true \
-            -p:BuildNumber=${{ github.run_number }} \
+            -p:Version=1.0.${{ github.run_number }} \
             --output ./publish
 
+      - name: Create archive (Unix)
+        if: runner.os != 'Windows'
+        shell: bash
+        run: |
+          cd ./publish
+          tar -czvf ../MyDesktopApplication-${{ matrix.artifact }}.tar.gz .
+
+      - name: Create archive (Windows)
+        if: runner.os == 'Windows'
+        shell: pwsh
+        run: |
+          Compress-Archive -Path ./publish/* -DestinationPath ./MyDesktopApplication-${{ matrix.artifact }}.zip
+
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.artifact }}
-          path: ./publish/
-          retention-days: 30
+          path: |
+            ./MyDesktopApplication-${{ matrix.artifact }}.tar.gz
+            ./MyDesktopApplication-${{ matrix.artifact }}.zip
+          if-no-files-found: error
+          retention-days: 7
 
-  # =============================================================================
+  # ===========================================================================
   # Build Android APK
-  # =============================================================================
+  # ===========================================================================
   build-android:
     needs: build-and-test
     if: github.event_name == 'push'
@@ -140,12 +139,6 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Setup Keystore
-        run: |
-          echo "${{ secrets.ANDROID_KEYSTORE_BASE64 }}" | base64 -d > "$GITHUB_WORKSPACE/android.keystore"
-          echo "Keystore created at: $GITHUB_WORKSPACE/android.keystore"
-          ls -la "$GITHUB_WORKSPACE/android.keystore"
-
       - name: Setup .NET
         uses: actions/setup-dotnet@v4
         with:
@@ -160,47 +153,68 @@ jobs:
       - name: Install Android workload
         run: dotnet workload install android
 
-      - name: Accept Android licenses
-        run: yes | $ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager --licenses || true
+      - name: Setup Keystore
+        if: ${{ secrets.ANDROID_KEYSTORE_BASE64 != '' }}
+        run: |
+          echo "${{ secrets.ANDROID_KEYSTORE_BASE64 }}" | base64 -d > "$GITHUB_WORKSPACE/android.keystore"
+          echo "KEYSTORE_PATH=$GITHUB_WORKSPACE/android.keystore" >> "$GITHUB_ENV"
+          echo "HAS_KEYSTORE=true" >> "$GITHUB_ENV"
 
-      - name: Build and Sign Android APK
+      - name: Build Android APK (Signed)
+        if: env.HAS_KEYSTORE == 'true'
+        shell: bash
         run: |
           dotnet publish src/MyDesktopApplication.Android/MyDesktopApplication.Android.csproj \
             --configuration Release \
-            -p:BuildNumber=${{ github.run_number }} \
-            --output ./publish/android \
+            -p:ApplicationVersion=${{ github.run_number }} \
+            -p:ApplicationDisplayVersion=1.0.${{ github.run_number }} \
             -p:AndroidKeyStore=true \
-            -p:AndroidSigningKeyStore="$GITHUB_WORKSPACE/android.keystore" \
+            -p:AndroidSigningKeyStore="${{ env.KEYSTORE_PATH }}" \
             -p:AndroidSigningStorePass="${{ secrets.ANDROID_SIGNING_PASSWORD }}" \
             -p:AndroidSigningKeyPass="${{ secrets.ANDROID_SIGNING_PASSWORD }}" \
-            -p:AndroidSigningKeyAlias=myalias
+            -p:AndroidSigningKeyAlias=myalias \
+            -p:AndroidUseAapt2Daemon=false \
+            --output ./publish/android
 
-      - name: Find and rename APK
+      - name: Build Android APK (Unsigned)
+        if: env.HAS_KEYSTORE != 'true'
+        shell: bash
         run: |
-          APK_PATH=$(find ./publish/android -name "*-Signed.apk" | head -1)
-          if [[ -z "$APK_PATH" ]]; then
-            APK_PATH=$(find ./publish/android -name "*.apk" | head -1)
-          fi
+          dotnet publish src/MyDesktopApplication.Android/MyDesktopApplication.Android.csproj \
+            --configuration Release \
+            -p:ApplicationVersion=${{ github.run_number }} \
+            -p:ApplicationDisplayVersion=1.0.${{ github.run_number }} \
+            -p:AndroidUseAapt2Daemon=false \
+            --output ./publish/android
+
+      - name: Rename APK
+        shell: bash
+        run: |
+          # Find the APK (could be -Signed.apk or just .apk)
+          APK_PATH=$(find ./publish/android -name "*-Signed.apk" -o -name "*.apk" | grep -v "\.aab$" | head -1)
           
           if [[ -n "$APK_PATH" ]]; then
-            cp "$APK_PATH" "./publish/MyDesktopApplication-android-${{ github.run_number }}.apk"
-            echo "APK renamed to: MyDesktopApplication-android-${{ github.run_number }}.apk"
+            FINAL_NAME="MyDesktopApplication-android-${{ github.run_number }}.apk"
+            cp "$APK_PATH" "./$FINAL_NAME"
+            echo "APK renamed to: $FINAL_NAME"
+            ls -la "./$FINAL_NAME"
           else
-            echo "No APK found!"
-            find ./publish -type f -name "*.apk" || echo "No APK files anywhere"
+            echo "ERROR: No APK found!"
+            find ./publish -type f -name "*.apk" || echo "No APK files found anywhere"
             exit 1
           fi
 
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
           name: android
-          path: ./publish/MyDesktopApplication-android-${{ github.run_number }}.apk
-          retention-days: 30
+          path: ./MyDesktopApplication-android-${{ github.run_number }}.apk
+          if-no-files-found: error
+          retention-days: 7
 
-  # =============================================================================
-  # Create Release
-  # =============================================================================
+  # ===========================================================================
+  # Create GitHub Release
+  # ===========================================================================
   create-release:
     needs: [build-desktop, build-android]
     if: github.event_name == 'push'
@@ -213,8 +227,21 @@ jobs:
         with:
           path: ./artifacts
 
-      - name: List artifacts
-        run: find ./artifacts -type f
+      - name: Prepare release files
+        shell: bash
+        run: |
+          echo "=== Downloaded artifacts structure ==="
+          find ./artifacts -type f
+          echo ""
+          
+          # Create flat release directory
+          mkdir -p ./release
+          
+          # Copy all archives and APK to release folder (flatten structure)
+          find ./artifacts -type f \( -name "*.tar.gz" -o -name "*.zip" -o -name "*.apk" \) -exec cp {} ./release/ \;
+          
+          echo "=== Release files ==="
+          ls -la ./release/
 
       - name: Create Release
         uses: softprops/action-gh-release@v2
@@ -223,7 +250,32 @@ jobs:
           name: Release v1.0.${{ github.run_number }}
           draft: false
           prerelease: false
-          files: |
-            ./artifacts/**/*
+          generate_release_notes: true
+          files: ./release/*
+          body: |
+            ## MyDesktopApplication v1.0.${{ github.run_number }}
+            
+            ### Downloads
+            
+            | Platform | File |
+            |----------|------|
+            | Windows x64 | `MyDesktopApplication-win-x64.zip` |
+            | Windows ARM64 | `MyDesktopApplication-win-arm64.zip` |
+            | Linux x64 | `MyDesktopApplication-linux-x64.tar.gz` |
+            | Linux ARM64 | `MyDesktopApplication-linux-arm64.tar.gz` |
+            | macOS x64 (Intel) | `MyDesktopApplication-osx-x64.tar.gz` |
+            | macOS ARM64 (Apple Silicon) | `MyDesktopApplication-osx-arm64.tar.gz` |
+            | Android | `MyDesktopApplication-android-${{ github.run_number }}.apk` |
+            
+            ### Android Users (Obtainium)
+            
+            **Version Code**: `${{ github.run_number }}`
+            
+            Point Obtainium to this repository's releases for automatic updates.
+            The APK version code increments with each release.
+            
+            ### Changes
+            
+            See commit history for details.
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}