Skip to content

Commit

Permalink
Merge pull request Expensify#51766 from Expensify/andrew-hybrid-fixes2
Browse files Browse the repository at this point in the history
[No QA]Fix Android submission and asset naming for deploy
  • Loading branch information
luacmartins authored Oct 31, 2024
2 parents 26e9523 + 4159730 commit aa6401d
Show file tree
Hide file tree
Showing 2 changed files with 51 additions and 18 deletions.
50 changes: 32 additions & 18 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -797,18 +797,25 @@ jobs:
- name: Upload artifacts to GitHub Release
continue-on-error: true
run: |
gh release upload ${{ needs.prep.outputs.APP_VERSION }} --repo ${{ github.repository }} --clobber \
./android-sourcemaps-artifact/index.android.bundle.map#android-sourcemap-${{ needs.prep.outputs.APP_VERSION }} \
./android-aab-artifact/app-production-release.aab \
./android-hybrid-build-artifact/Expensify-release.aab#Android-HybridApp.aab \
./desktop-staging-sourcemaps-artifact/desktop-staging-merged-source-map.js.map#desktop-staging-sourcemap-${{ needs.prep.outputs.APP_VERSION }} \
./desktop-staging-build-artifact/NewExpensify.dmg#NewExpensifyStaging.dmg \
./ios-sourcemaps-artifact/main.jsbundle.map#ios-sourcemap-${{ needs.prep.outputs.APP_VERSION }} \
./ios-build-artifact/New\ Expensify.ipa \
./ios-hybrid-build-artifact/Expensify.ipa#iOS-HybridApp.ipa \
./web-staging-sourcemaps-artifact/web-staging-merged-source-map.js.map#web-staging-sourcemap-${{ needs.prep.outputs.APP_VERSION }} \
./web-staging-build-tar-gz-artifact/webBuild.tar.gz#stagingWebBuild.tar.gz \
./web-staging-build-zip-artifact/webBuild.zip#stagingWebBuild.zip
# Release asset name should follow the template: [platform]-[hybrid, staging, production or blank]-[sourcemap or blank].[file extension]
files=(
"./android-sourcemaps-artifact/index.android.bundle.map#android-sourcemap.js.map"
"./android-aab-artifact/app-production-release.aab#android.aab"
"./android-hybrid-build-artifact/Expensify-release.aab#android-hybrid.aab"
"./desktop-staging-sourcemaps-artifact/desktop-staging-merged-source-map.js.map#desktop-staging-sourcemap.js.map"
"./desktop-staging-build-artifact/NewExpensify.dmg#desktop-staging.dmg"
"./ios-sourcemaps-artifact/main.jsbundle.map#ios-sourcemap.js.map"
"./ios-build-artifact/New Expensify.ipa#ios.ipa"
"./ios-hybrid-build-artifact/Expensify.ipa#ios-hybrid.ipa"
"./web-staging-sourcemaps-artifact/web-staging-sourcemap.js.map#web-staging-sourcemap.js.map"
"./web-staging-build-tar-gz-artifact/webBuild.tar.gz#web-staging.tar.gz"
"./web-staging-build-zip-artifact/webBuild.zip#web-staging.zip"
)
# Loop through each file and upload individually (so if one fails, we still have other platforms uploaded)
for file_entry in "${files[@]}"; do
gh release upload "$APP_VERSION" --repo "$GITHUB_REPOSITORY" --clobber "$file_entry"
done
env:
GITHUB_TOKEN: ${{ github.token }}

Expand Down Expand Up @@ -855,12 +862,19 @@ jobs:
- name: Upload artifacts to GitHub Release
continue-on-error: true
run: |
gh release upload ${{ needs.prep.outputs.APP_VERSION }} --repo ${{ github.repository }} --clobber \
./desktop-sourcemaps-artifact/desktop-merged-source-map.js.map#desktop-sourcemap-${{ needs.prep.outputs.APP_VERSION }} \
./desktop-build-artifact/NewExpensify.dmg \
./web-sourcemaps-artifact/web-merged-source-map.js.map#web-sourcemap-${{ needs.prep.outputs.APP_VERSION }} \
./web-build-tar-gz-artifact/webBuild.tar.gz \
./web-build-zip-artifact/webBuild.zip
# Release asset name should follow the template: [platform]-[hybrid, staging, production or blank]-[sourcemap or blank].[file extension]
files=(
"./desktop-sourcemaps-artifact/desktop-merged-source-map.js.map#desktop-production-sourcemap.js.map"
"./desktop-build-artifact/NewExpensify.dmg#desktop-production.dmg"
"./web-sourcemaps-artifact/web-merged-source-map.js.map#web-production-sourcemap.js.map"
"./web-build-tar-gz-artifact/webBuild.tar.gz#web-production.tar.gz"
"./web-build-zip-artifact/webBuild.zip#web-production.zip"
)
# Loop through each file and upload individually (so if one fails, we still have other platforms uploaded)
for file_entry in "${files[@]}"; do
gh release upload "$APP_VERSION" --repo "$GITHUB_REPOSITORY" --clobber "$file_entry"
done
env:
GITHUB_TOKEN: ${{ github.token }}

Expand Down
19 changes: 19 additions & 0 deletions fastlane/Fastfile
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,25 @@ platform :android do
track: 'alpha',
rollout: '1.0'
)

# Update the internal testing group "beta" with the latest version
upload_to_play_store(
package_name: "org.me.mobiexpensifyg",
json_key: './android-fastlane-json-key.json',
track: 'alpha',
track_promote_to: 'beta',
skip_upload_aab: true
)

# Update the internal testing group "Internal Testers" with the latest version
upload_to_play_store(
package_name: "org.me.mobiexpensifyg",
json_key: './android-fastlane-json-key.json',
track: 'alpha',
track_promote_to: 'Internal Testers',
skip_upload_aab: true
)

end

desc "Deploy app to Google Play production"
Expand Down

0 comments on commit aa6401d

Please sign in to comment.