Upload artifacts

tonkeeper · Jul 16, 2024 · fe0097a · fe0097a
1 parent 3c6ad93
commit fe0097a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -47,4 +47,11 @@ jobs:
         with:
           name: Tonkeeper X aab ${{ env.VERSION_CODE }}
           path: |
-            ${{ github.workspace }}/apps/wallet/instance/main/src/release
+            ${{ env.AAB_OUTPUT_PATH }}
+
+      - name: Upload android apk to artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: Tonkeeper X apk ${{ env.VERSION_CODE }}
+          path: |
+            ${{ env.APK_OUTPUT_PATH }}
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
@@ -61,21 +61,19 @@ platform :android do
             }
         )
 
-        sh("ls -lR ../apps/wallet/instance/main/src/release")
-
         puts "Debug"
         puts Actions.lane_context[SharedValues::GRADLE_AAB_OUTPUT_PATH]
         puts Actions.lane_context[SharedValues::GRADLE_ALL_AAB_OUTPUT_PATHS]
         puts Actions.lane_context[SharedValues::GRADLE_APK_OUTPUT_PATH]
         puts Actions.lane_context[SharedValues::GRADLE_ALL_APK_OUTPUT_PATHS]
 
-        sh("echo OUTPUT_PATH=#{Actions.lane_context[SharedValues::GRADLE_AAB_OUTPUT_PATH]} >> $GITHUB_ENV")
+        sh("echo AAB_OUTPUT_PATH=#{Actions.lane_context[SharedValues::GRADLE_AAB_OUTPUT_PATH]} >> $GITHUB_ENV")
     end
 
     desc "Build the android apk"
     lane :assemble_release do
         gradle(
-            task: ":apps:wallet.instance:main:assemble",
+            task: ":apps:wallet:instance:main:assemble",
             build_type: "Release",
             properties: {
                 "android.injected.signing.store.file" => ENV["KEYSTORE_FILE"],
@@ -85,15 +83,13 @@ platform :android do
             }  
         )
 
-        sh("ls -lR ./apps/wallet/instance/main/release/")
-
         puts "Debug"
         puts Actions.lane_context[SharedValues::GRADLE_AAB_OUTPUT_PATH]
         puts Actions.lane_context[SharedValues::GRADLE_ALL_AAB_OUTPUT_PATHS]
         puts Actions.lane_context[SharedValues::GRADLE_APK_OUTPUT_PATH]
         puts Actions.lane_context[SharedValues::GRADLE_ALL_APK_OUTPUT_PATHS]
 
-        sh("echo OUTPUT_PATH=#{Actions.lane_context[SharedValues::GRADLE_APK_OUTPUT_PATH]} >> $GITHUB_ENV")
+        sh("echo APK_OUTPUT_PATH=#{Actions.lane_context[SharedValues::GRADLE_APK_OUTPUT_PATH]} >> $GITHUB_ENV")
     end
 
     desc "Upload to GooglePlay"
@@ -114,11 +110,7 @@ platform :android do
         fetch_and_increment_build_number
         build_release
         upload_release
-    end
 
-    desc "Build APK"
-    lane :apk do
-        fetch_and_increment_build_number
         assemble_release
     end
 end