Consolidate S3 paths

Expensify · Oct 2, 2024 · 342f861 · 342f861
1 parent 660020d
commit 342f861
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/.github/workflows/testBuild.yml b/.github/workflows/testBuild.yml
@@ -78,7 +78,6 @@ jobs:
       RUBYOPT: '-rostruct'
     outputs:
       S3_APK_PATH: ${{ steps.exportS3Paths.outputs.S3_APK_PATH }}
-      S3_HTML_PATH: ${{ steps.exportS3Paths.outputs.S3_HTML_PATH }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -117,9 +116,8 @@ jobs:
       - name: Export S3 paths
         id: exportS3Paths
         run: |
-          # $s3APKPath and $s3HtmlPath are from within the Fastfile, android upload_s3 lane
+          # $s3APKPath is set from within the Fastfile, android upload_s3 lane
           echo "S3_APK_PATH=$s3APKPath" >> "$GITHUB_OUTPUT"
-          echo "S3_HTML_PATH=$s3HtmlPath" >> "$GITHUB_OUTPUT"
 
   iOS:
     name: Build and deploy iOS for testing
@@ -326,7 +324,7 @@ jobs:
           DESKTOP: ${{ needs.desktop.result }}
           IOS: ${{ needs.iOS.result }}
           WEB: ${{ needs.web.result }}
-          ANDROID_LINK: ${{ needs.uploadAndroid.outputs.S3_HTML_PATH }}
+          ANDROID_LINK: ${{ needs.uploadAndroid.outputs.S3_APK_PATH }}
           DESKTOP_LINK: https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/${{ env.PULL_REQUEST_NUMBER }}/NewExpensify.dmg
           IOS_LINK: ${{ steps.get_ios_path.outputs.ios_path }}
           WEB_LINK: https://${{ env.PULL_REQUEST_NUMBER }}.pr-testing.expensify.com
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
@@ -16,11 +16,10 @@ skip_docs
 opt_out_usage
 
 KEY_GRADLE_APK_PATH = "apkPath"
+KEY_S3_APK_PATH = "s3APKPath"
 KEY_GRADLE_AAB_PATH = "aabPath"
 KEY_IPA_PATH = "ipaPath"
 KEY_DSYM_PATH = "dsymPath"
-KEY_S3_APK_PATH = "s3APKPath"
-KEY_S3_HTML_PATH = "s3HtmlPath"
 
 # Export environment variables to GITHUB_ENV
 # If there's no GITHUB_ENV file set in the env, then this is a no-op
@@ -135,8 +134,7 @@ platform :android do
     )
     puts "Saving S3 outputs in env..."
     exportEnvVars({
-      KEY_S3_APK_PATH => lane_context[SharedValues::S3_APK_OUTPUT_PATH],
-      KEY_S3_HTML_PATH => lane_context[SharedValues::S3_HTML_OUTPUT_PATH],
+      KEY_S3_APK_PATH => lane_context[SharedValues::S3_HTML_OUTPUT_PATH],
     })
   end