Skip to content

Commit 21b0fbb

Browse files
authored
refactor(native): flatten "official" naming across Android, iOS, CI (#7325)
1 parent 35e5ad1 commit 21b0fbb

74 files changed

Lines changed: 103 additions & 109 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/actions/build-android/action.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,19 @@ inputs:
88
description: 'Google services JSON'
99
required: true
1010
BUGSNAG_KEY_OFFICIAL:
11-
description: 'Bugsnag API key for official build'
11+
description: 'Bugsnag API key'
1212
required: true
1313
KEYSTORE_OFFICIAL_BASE64:
14-
description: 'Base64 encoded keystore for official build'
14+
description: 'Base64 encoded keystore'
1515
required: true
1616
KEYSTORE_OFFICIAL:
17-
description: 'Keystore file name for official build'
17+
description: 'Keystore file name'
1818
required: true
1919
KEYSTORE_OFFICIAL_PASSWORD:
20-
description: 'Keystore password for official build'
20+
description: 'Keystore password'
2121
required: true
2222
KEYSTORE_OFFICIAL_ALIAS:
23-
description: 'Keystore alias for official build'
23+
description: 'Keystore alias'
2424
required: true
2525

2626
runs:
@@ -81,17 +81,17 @@ runs:
8181

8282
- name: Build Android Release AAB
8383
working-directory: android
84-
run: ./gradlew bundleOfficialRelease
84+
run: ./gradlew bundleRelease
8585
shell: bash
8686

8787
- name: Upload sourcemaps/NDK symbols to Bugsnag
8888
run: |
89-
pnpm bugsnag:upload-android --variant officialRelease --app-manifest android/app/build/intermediates/merged_manifests/officialRelease/processOfficialReleaseManifest/AndroidManifest.xml
90-
pnpm exec bugsnag-cli upload android-aab android/app/build/outputs/bundle/officialRelease/app-official-release.aab
89+
pnpm bugsnag:upload-android --variant release --app-manifest android/app/build/intermediates/merged_manifests/release/processReleaseManifest/AndroidManifest.xml
90+
pnpm exec bugsnag-cli upload android-aab android/app/build/outputs/bundle/release/app-release.aab
9191
shell: bash
9292

93-
- name: Upload Official AAB
93+
- name: Upload AAB
9494
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
9595
with:
96-
name: android-aab-official
97-
path: android/app/build/outputs/bundle/officialRelease/app-official-release.aab
96+
name: android-aab
97+
path: android/app/build/outputs/bundle/release/app-release.aab

.github/actions/build-ios/action.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ inputs:
2626
description: 'Fastlane Repo PAT'
2727
required: true
2828
BUGSNAG_KEY_OFFICIAL:
29-
description: 'Bugsnag API Key Official'
29+
description: 'Bugsnag API Key'
3030
required: true
3131
GOOGLE_SERVICES_IOS:
32-
description: 'Google service file for official version'
32+
description: 'Google service file'
3333
required: true
3434

3535
runs:
@@ -90,7 +90,7 @@ runs:
9090

9191
- name: Build iOS app
9292
working-directory: ios
93-
run: bundle exec fastlane ios build_official
93+
run: bundle exec fastlane ios build
9494
env:
9595
MATCH_KEYCHAIN_NAME: ${{ inputs.MATCH_KEYCHAIN_NAME }}
9696
MATCH_KEYCHAIN_PASSWORD: ${{ inputs.MATCH_KEYCHAIN_PASSWORD }}
@@ -103,17 +103,17 @@ runs:
103103
- name: Upload IPA artifact
104104
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
105105
with:
106-
name: ios-build-official
106+
name: ios-build
107107
path: ios/Rocket.Chat.ipa
108108

109109
- name: Upload Rocket.Chat.app.dSYM.zip
110110
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
111111
with:
112-
name: ios-build-official-dSYM
112+
name: ios-build-dSYM
113113
path: ios/Rocket.Chat.app.dSYM.zip
114114

115115
- name: Upload RocketChatRN/Info.plist
116116
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
117117
with:
118-
name: ios-build-official-info-plist
118+
name: ios-build-info-plist
119119
path: ios/RocketChatRN/Info.plist

.github/actions/upload-android/action.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ inputs:
1818
runs:
1919
using: "composite"
2020
steps:
21-
- name: Download Official AAB
21+
- name: Download AAB
2222
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
2323
with:
24-
name: android-aab-official
25-
path: android/app/build/outputs/bundle/officialRelease/
24+
name: android-aab
25+
path: android/app/build/outputs/bundle/release/
2626

2727
- name: Set up Ruby and Bundler
2828
uses: ruby/setup-ruby@7372622e62b60b3cb750dcd2b9e32c247ffec26a # v1.302.0
@@ -64,7 +64,7 @@ runs:
6464
bundle exec fastlane android beta
6565
fi
6666
if [[ ${{ inputs.trigger }} == "develop" ]]; then
67-
bundle exec fastlane android official_open_testing
67+
bundle exec fastlane android open_testing
6868
fi
6969
shell: bash
7070

.github/actions/upload-internal-android/action.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ inputs:
1818
runs:
1919
using: "composite"
2020
steps:
21-
- name: Download Official AAB
21+
- name: Download AAB
2222
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
2323
with:
24-
name: android-aab-official
25-
path: android/app/build/outputs/bundle/officialRelease/
24+
name: android-aab
25+
path: android/app/build/outputs/bundle/release/
2626

2727
- name: Set up Ruby and Bundler
2828
uses: ruby/setup-ruby@7372622e62b60b3cb750dcd2b9e32c247ffec26a # v1.302.0

.github/actions/upload-ios/action.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,19 +36,19 @@ runs:
3636
- name: Download iOS build
3737
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
3838
with:
39-
name: ios-build-official
39+
name: ios-build
4040
path: ios/
4141

4242
- name: Download dSYM
4343
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
4444
with:
45-
name: ios-build-official-dSYM
45+
name: ios-build-dSYM
4646
path: ios/
4747

4848
- name: Download Info.plist
4949
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
5050
with:
51-
name: ios-build-official-info-plist
51+
name: ios-build-info-plist
5252
path: ios/RocketChatRN/
5353

5454
- name: Pod Cache
@@ -91,7 +91,7 @@ runs:
9191
- name: Fastlane Submit to TestFlight
9292
working-directory: ios
9393
run: |
94-
echo "Submitting to TestFlight as Official"
94+
echo "Submitting to TestFlight"
9595
bundle exec fastlane ios beta
9696
env:
9797
MATCH_KEYCHAIN_NAME: ${{ inputs.MATCH_KEYCHAIN_NAME }}

.github/scripts/run-maestro.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ printf ' %s\n' "${FLOW_FILES[@]}"
7171

7272
if [ "$PLATFORM" = "android" ]; then
7373
adb shell settings put system show_touches 1 || true
74-
adb install -r "app-official-release.apk" || true
74+
adb install -r "app-release.apk" || true
7575
adb shell monkey -p "$APP_ID" -c android.intent.category.LAUNCHER 1 || true
7676
sleep 6
7777
adb shell am force-stop "$APP_ID" || true

.github/workflows/build-official-android.yml renamed to .github/workflows/build-android.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
- name: Fetch supported versions from Cloud
3535
uses: ./.github/actions/fetch-supported-versions
3636
with:
37-
build_name: 'android-official'
37+
build_name: 'android'
3838

3939
- name: Generate Build Version
4040
id: version

.github/workflows/build-develop.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,19 @@ jobs:
2323
needs: [run-eslint-and-test]
2424
uses: ./.github/workflows/generate-changelog.yml
2525

26-
android-build-official-store:
27-
name: Build Android Official
26+
android-build-store:
27+
name: Build Android
2828
if: ${{ github.repository == 'RocketChat/Rocket.Chat.ReactNative' }}
29-
uses: ./.github/workflows/build-official-android.yml
29+
uses: ./.github/workflows/build-android.yml
3030
needs: [run-eslint-and-test, generate-changelog]
3131
secrets: inherit
3232
with:
3333
trigger: develop
3434

35-
ios-build-official-store:
36-
name: Build iOS Official
35+
ios-build-store:
36+
name: Build iOS
3737
if: ${{ github.repository == 'RocketChat/Rocket.Chat.ReactNative' }}
38-
uses: ./.github/workflows/build-official-ios.yml
38+
uses: ./.github/workflows/build-ios.yml
3939
needs: [run-eslint-and-test, generate-changelog]
4040
secrets: inherit
4141
with:
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
- name: Fetch supported versions from Cloud
3333
uses: ./.github/actions/fetch-supported-versions
3434
with:
35-
build_name: 'ios-official'
35+
build_name: 'ios'
3636

3737
- name: Generate Build Version
3838
id: version

.github/workflows/build-pr.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,19 @@ jobs:
1919
if: ${{ github.repository == 'RocketChat/Rocket.Chat.ReactNative' }}
2020
uses: ./.github/workflows/eslint.yml
2121

22-
android-build-official-store:
23-
name: Build Android Official
22+
android-build-store:
23+
name: Build Android
2424
if: ${{ github.repository == 'RocketChat/Rocket.Chat.ReactNative' }}
25-
uses: ./.github/workflows/build-official-android.yml
25+
uses: ./.github/workflows/build-android.yml
2626
needs: [run-eslint-and-test]
2727
secrets: inherit
2828
with:
2929
trigger: "pr"
3030

31-
ios-build-official-store:
32-
name: Build iOS Official
31+
ios-build-store:
32+
name: Build iOS
3333
if: ${{ github.repository == 'RocketChat/Rocket.Chat.ReactNative' }}
34-
uses: ./.github/workflows/build-official-ios.yml
34+
uses: ./.github/workflows/build-ios.yml
3535
needs: [run-eslint-and-test]
3636
secrets: inherit
3737
with:

0 commit comments

Comments
 (0)