j

Author: DerGoogler

.github/workflows/release-ci.yml

@@ -45,8 +45,7 @@ jobs:
     name: Build spoofed APK
     runs-on: ubuntu-latest
     outputs:
-      spoofed_apk_path: ${{ steps.find_apk.outputs.APK_PATH }}
-      spoofed_mapping_path: ${{ steps.find_mapping.outputs.MAPPING_PATH }}
+      release-name: ${{ steps.release-name.outputs.name }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4.2.2
@@ -101,8 +100,7 @@ jobs:
     name: Build un-spoofed APK
     runs-on: ubuntu-latest
     outputs:
-      apk_path: ${{ steps.find_apk.outputs.APK_PATH }}
-      mapping_path: ${{ steps.normal_mapping.outputs.MAPPING_PATH }}
+      release-name: ${{ steps.release-name.outputs.name }}
     steps:
       - name: Parse input
         run: |
@@ -162,15 +160,50 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4.2.2
-      
-      - name: Set up JDK
-        uses: actions/setup-java@v4.7.1
+    
+      - name: Download Un-Spoofed APK
+        uses: actions/download-artifact@v4
         with:
-          distribution: 'zulu'
-          java-version: 21
+          name: ${{ needs.build.outputs.release-name }}
 
-      - name: Set up Gradle
-        uses: gradle/actions/setup-gradle@v4.3.1
+      - name: Download Spoofed APK
+        uses: actions/download-artifact@v4
+        with:
+          name: ${{ needs.spoofed-build.outputs.release-name }}
+
+      - name: Download Un-Spoofed Mappings
+        uses: actions/download-artifact@v4
+        with:
+          name: mappings
+
+      - name: Download Spoofed Mappings
+        uses: actions/download-artifact@v4
+        with:
+          name: spoofed-mappings
+
+      - name: Find normal APK
+        id: find_normal_apk
+        run: |
+          APK_PATH=$(find ${{ needs.build.outputs.release-name }} -name "*.apk" | head -n 1)
+          echo "APK_PATH=$APK_PATH" >> $GITHUB_OUTPUT
+
+      - name: Find spoofed APK
+        id: find_spoofed_apk
+        run: |
+          APK_PATH=$(find ${{ needs.spoofed-build.outputs.release-name }} -name "*.apk" | head -n 1)
+          echo "APK_PATH=APK_PATH" >> $GITHUB_OUTPUT
+
+      - name: Find normal mapping file
+        id: normal_mapping
+        run: |
+          MAPPING_PATH=$(find mappings -name "mapping.txt" | head -n 1)
+          echo "MAPPING_PATH=$MAPPING_PATH" >> $GITHUB_OUTPUT
+
+      - name: Find spoofed mapping file
+        id: spoofed_mapping
+        run: |
+          MAPPING_PATH=$(find spoofed-mappings -name "mapping.txt" | head -n 1)
+          echo "MAPPING_PATH=$MAPPING_PATH" >> $GITHUB_OUTPUT
 
       - name: Get commit info and build timestamp
         id: meta
@@ -199,8 +232,8 @@ jobs:
               Type: ${{ env.BUILD_TYPE_CASED }}
               [Workflow run](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }})
           files: |
-            ${{ needs.build.outputs.apk_path }}
-            ${{ needs.spoofed-build.outputs.spoofed_apk_path }}
+            ${{ steps.find_normal_apk.outputs.APK_PATH }}
+            ${{ steps.find_spoofed_apk.outputs.SPOOFED_APK_PATH }}
         env:
           API_ID: ${{ secrets.API_ID }}
           API_HASH: ${{ secrets.API_HASH }}
@@ -245,7 +278,7 @@ jobs:
         uses: actions/upload-release-asset@v1
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ${{ needs.build.outputs.apk_path }}
+          asset_path: ${{ steps.find_normal_apk.outputs.APK_PATH }}
           asset_name: normal.apk
           asset_content_type: application/vnd.android.package-archive
         env:
@@ -256,7 +289,7 @@ jobs:
         uses: actions/upload-release-asset@v1
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ${{ needs.spoofed-build.outputs.spoofed_apk_path }}
+          asset_path: ${{ steps.find_spoofed_apk.outputs.APK_PATH }}
           asset_name: spoofed.apk
           asset_content_type: application/vnd.android.package-archive
         env:
@@ -267,7 +300,7 @@ jobs:
         uses: actions/upload-release-asset@v1
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ${{ needs.build.outputs.mapping_path }}
+          asset_path: ${{ steps.normal_mapping.outputs.MAPPING_PATH }}
           asset_name: mapping.txt
           asset_content_type: text/plain
         env:
@@ -278,7 +311,7 @@ jobs:
         uses: actions/upload-release-asset@v1
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ${{ needs.spoofed-build.outputs.spoofed_mapping_path }}
+          asset_path: ${{ steps.spoofed_mapping.outputs.MAPPING_PATH }}
           asset_name: spoofed-mapping.txt
           asset_content_type: text/plain
         env: