更新Action文件

Author: lemon-codehub

.github/workflows/build-android-apk.yml

@@ -122,29 +122,17 @@ with open('app/build.gradle.backup', 'r') as f:
     content = f.read()
 
 # Add signing configuration before buildTypes
-signing_config = """    // Signing configuration added by GitHub Actions
-    if (project.hasProperty('RELEASE_STORE_FILE')) {
-        signingConfigs {
-            release {
-                storeFile file(RELEASE_STORE_FILE)
-                storePassword RELEASE_STORE_PASSWORD
-                keyAlias RELEASE_KEY_ALIAS
-                keyPassword RELEASE_KEY_PASSWORD
-            }
-        }
-    }
-
-"""
+signing_config = "    // Signing configuration added by GitHub Actions\n    if (project.hasProperty('RELEASE_STORE_FILE')) {\n        signingConfigs {\n            release {\n                storeFile file(RELEASE_STORE_FILE)\n                storePassword RELEASE_STORE_PASSWORD\n                keyAlias RELEASE_KEY_ALIAS\n                keyPassword RELEASE_KEY_PASSWORD\n            }\n        }\n    }\n\n"
 
 # Insert signing config before buildTypes
-content = content.replace('    buildTypes {', signing_config + '    buildTypes {')
+if '    buildTypes {' in content:
+    content = content.replace('    buildTypes {', signing_config + '    buildTypes {')
+else:
+    print("Error: Could not find buildTypes section in build.gradle")
+    exit(1)
 
 # Update release build type to use signing config
-old_release = """        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }"""
-
+old_release_pattern = r"(\s+release\s+\{[\s\S]*?minifyEnabled\s+\w+\s*[\s\S]*?proguardFiles\s+.*?[\s\S]*?\})"
 new_release = """        release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
@@ -153,7 +141,19 @@ new_release = """        release {
             }
         }"""
 
-content = content.replace(old_release, new_release)
+# Try to replace the release build type
+if re.search(old_release_pattern, content):
+    content = re.sub(old_release_pattern, new_release, content)
+else:
+    print("Warning: Could not find release build type to update")
+    # Try to find and update just the signing config part
+    if 'release {' in content and 'signingConfig' not in content:
+        # Add signing config to existing release block
+        content = re.sub(
+            r'(\s+release\s+\{[\s\S]*?proguardFiles\s+.*?[\s\S]*?\})',
+            r'\1\n            if (project.hasProperty(\'RELEASE_STORE_FILE\')) {\n                signingConfig signingConfigs.release\n            }',
+            content
+        )
 
 # Write updated content
 with open('app/build.gradle', 'w') as f:
@@ -165,6 +165,15 @@ EOF
         # Run the script
         python3 add_signing.py
 
+        # Verify the changes were applied
+        if grep -q "signingConfigs" app/build.gradle; then
+            echo "Signing configuration added successfully"
+        else
+            echo "Warning: Signing configuration may not have been added correctly"
+            echo "Checking build.gradle for buildTypes section:"
+            grep -A 10 "buildTypes" app/build.gradle || echo "buildTypes section not found"
+        fi
+        
         # Clean up
         rm add_signing.py
       shell: bash
@@ -173,6 +182,21 @@ EOF
       run: |
         cd android
         ./gradlew assembleDebug
+        
+        # Check if debug APK was created
+        echo "Checking for debug APK..."
+        ls -la app/build/outputs/apk/debug/
+        
+        # Verify the debug APK exists
+        DEBUG_APK="app/build/outputs/apk/debug/app-debug.apk"
+        if [ -f "$DEBUG_APK" ]; then
+          echo "Debug APK created successfully: $DEBUG_APK"
+        else
+          echo "Error: Debug APK not found at $DEBUG_APK"
+          echo "Contents of debug directory:"
+          ls -la app/build/outputs/apk/debug/
+          exit 1
+        fi
       shell: bash
 
     - name: Build Release APK
@@ -196,14 +220,23 @@ EOF
           ./gradlew assembleRelease
         fi
         
-        # Verify the APK was created with the expected name
+        # Check if APK was created
+        echo "Checking for release APK..."
+        ls -la app/build/outputs/apk/release/
+        
+        # Try to find the APK with expected name or fallback to default
         VERSION="${{ steps.version.outputs.version }}"
         EXPECTED_APK="app/build/outputs/apk/release/lemon_push_v${VERSION}.apk"
+        FALLBACK_APK="app/build/outputs/apk/release/app-release.apk"
+        
         if [ -f "$EXPECTED_APK" ]; then
-          echo "Release APK created successfully: $EXPECTED_APK"
+          echo "Found release APK with expected name: $EXPECTED_APK"
+        elif [ -f "$FALLBACK_APK" ]; then
+          echo "Found release APK with default name, renaming to expected name..."
+          cp "$FALLBACK_APK" "$EXPECTED_APK"
         else
-          echo "Error: Expected release APK not found at $EXPECTED_APK"
-          echo "Listing release directory contents:"
+          echo "Error: No release APK found!"
+          echo "Contents of release directory:"
           ls -la app/build/outputs/apk/release/
           exit 1
         fi
@@ -217,6 +250,19 @@ EOF
         # Copy release APK (release builds are renamed by applicationVariants.all)
         cp android/app/build/outputs/apk/release/lemon_push_v${{ steps.version.outputs.version }}.apk "release/${{ env.ENGLISH_NAME }}_v${{ steps.version.outputs.version }}_release.apk"
         
+        # Verify APKs exist
+        if [ ! -f "release/${{ env.ENGLISH_NAME }}_v${{ steps.version.outputs.version }}_debug.apk" ]; then
+          echo "Error: Debug APK not found!"
+          ls -la android/app/build/outputs/apk/debug/
+          exit 1
+        fi
+        
+        if [ ! -f "release/${{ env.ENGLISH_NAME }}_v${{ steps.version.outputs.version }}_release.apk" ]; then
+          echo "Error: Release APK not found!"
+          ls -la android/app/build/outputs/apk/release/
+          exit 1
+        fi
+        
         # Create checksums
         cd release
         sha256sum *.apk > checksums.txt
@@ -245,6 +291,23 @@ EOF
         name: android-checksums
         path: release/checksums.txt
         retention-days: 90
+        
+    - name: Clean up temporary files
+      if: always()
+      run: |
+        cd android
+        # Clean up keystore if it exists
+        if [ -f "app/keystore.jks" ]; then
+          echo "Removing temporary keystore file"
+          rm app/keystore.jks
+        fi
+        
+        # Restore original build.gradle if backup exists
+        if [ -f "app/build.gradle.backup" ]; then
+          echo "Restoring original build.gradle"
+          mv app/build.gradle.backup app/build.gradle
+        fi
+      shell: bash
 
   create-release:
     needs: build-android

.github/workflows/build.yml

@@ -26,9 +26,6 @@ jobs:
           - os: macos-latest
             platform: darwin/arm64
             artifact_suffix: darwin_arm64
-          - os: ubuntu-latest
-            platform: linux/amd64
-            artifact_suffix: linux_amd64
 
     runs-on: ${{ matrix.os }}
 
@@ -51,14 +48,6 @@ jobs:
     - name: Install Wails
       run: go install github.com/wailsapp/wails/v2/cmd/wails@latest
 
-    - name: Install Linux system dependencies
-      if: matrix.os == 'ubuntu-latest'
-      run: |
-        sudo apt-get update
-        sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.1-dev
-        sudo apt-get install -y libayatana-appindicator3-dev
-        sudo apt-get install -y libx11-dev libxrandr-dev libxinerama-dev libxcursor-dev libxi-dev
-      
     - name: Set version from tag or input
       run: |
         if [[ "${{ github.ref_type }}" == "tag" ]]; then
@@ -107,13 +96,6 @@ jobs:
         cp "desktop_gui/build/bin/${{ env.APP_NAME }}" "release/${{ env.ENGLISH_NAME }}_v${{ env.VERSION }}_darwin_arm64"
       shell: bash
 
-    - name: Prepare artifacts (Linux)
-      if: matrix.os == 'ubuntu-latest'
-      run: |
-        mkdir -p release
-        cp "desktop_gui/build/bin/${{ env.APP_NAME }}" "release/${{ env.ENGLISH_NAME }}_v${{ env.VERSION }}_linux_amd64"
-      shell: bash
-      
     - name: Create ZIP archive
       run: |
         cd release
@@ -161,7 +143,6 @@ jobs:
           ### 下载链接:
           - Windows (amd64): lemon_push_gui_v${{ env.VERSION }}_windows_amd64.zip
           - macOS (arm64): lemon_push_gui_v${{ env.VERSION }}_darwin_arm64.zip
-          - Linux (amd64): lemon_push_gui_v${{ env.VERSION }}_linux_amd64.zip
           
           ### 安装说明:
           #### Windows:
@@ -171,14 +152,9 @@ jobs:
           #### macOS:
           1. 下载并解压 lemon_push_gui_v${{ env.VERSION }}_darwin_arm64.zip
           2. 将 lemon_push_gui_v${{ env.VERSION }}_darwin_arm64 移动到应用程序文件夹
-          
-          #### Linux:
-          1. 下载并解压 lemon_push_gui_v${{ env.VERSION }}_linux_amd64.zip
-          2. 运行 lemon_push_gui_v${{ env.VERSION }}_linux_amd64
         files: |
             artifacts/windows/amd64/lemon_push_gui_v${{ env.VERSION }}_windows_amd64.zip
             artifacts/darwin/arm64/lemon_push_gui_v${{ env.VERSION }}_darwin_arm64.zip
-            artifacts/linux/amd64/lemon_push_gui_v${{ env.VERSION }}_linux_amd64.zip
         draft: false
         prerelease: false
       env: