Skip to content

Commit c1d47a3

Browse files
diegolmellodiegolmello
authored
chore: Merge 4.72.0 into master (#7316)
2 parents a5fea7f + 42ab243 commit c1d47a3

491 files changed

Lines changed: 240999 additions & 149048 deletions

File tree

Some content is hidden

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

‎.eslintignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,5 @@ coverage
44
e2e/docker
55
android
66
ios
7+
8+
.worktrees/

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

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -45,22 +45,17 @@ runs:
4545
using: "composite"
4646
steps:
4747
- name: Set up Ruby and Bundler
48-
uses: ruby/setup-ruby@v1
48+
uses: ruby/setup-ruby@7372622e62b60b3cb750dcd2b9e32c247ffec26a # v1.302.0
4949
with:
5050
ruby-version: 2.7.7
5151
bundler-cache: true
52-
53-
- name: Install Fastlane
54-
working-directory: android
55-
run: |
56-
bundle install --path gems
57-
shell: bash
52+
working-directory: android
5853

5954
- name: Set up Gradle
60-
uses: gradle/actions/setup-gradle@v4
55+
uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3
6156

6257
- name: Cache Gradle
63-
uses: actions/cache@v4
58+
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
6459
with:
6560
path: |
6661
~/.gradle
@@ -144,14 +139,14 @@ runs:
144139

145140
- name: Upload Experimental AAB
146141
if: ${{ inputs.type == 'experimental' }}
147-
uses: actions/upload-artifact@v4
142+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
148143
with:
149144
name: android-aab-experimental
150145
path: android/app/build/outputs/bundle/experimentalRelease/app-experimental-release.aab
151146

152147
- name: Upload Official AAB
153148
if: ${{ inputs.type == 'official' }}
154-
uses: actions/upload-artifact@v4
149+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
155150
with:
156151
name: android-aab-official
157-
path: android/app/build/outputs/bundle/officialRelease/app-official-release.aab
152+
path: android/app/build/outputs/bundle/officialRelease/app-official-release.aab

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -51,18 +51,18 @@ runs:
5151
shell: bash
5252

5353
- name: Set up Xcode
54-
uses: maxim-lobanov/setup-xcode@v1
54+
uses: maxim-lobanov/setup-xcode@ed7a3b1fda3918c0306d1b724322adc0b8cc0a90 # v1.7.0
5555
with:
5656
xcode-version: '26.2.0'
5757

5858
- name: Set up Ruby
59-
uses: ruby/setup-ruby@v1
59+
uses: ruby/setup-ruby@7372622e62b60b3cb750dcd2b9e32c247ffec26a # v1.302.0
6060
with:
6161
ruby-version: 2.7.7
6262
bundler-cache: true
6363

6464
- name: Pod Cache
65-
uses: actions/cache@v4
65+
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
6666
with:
6767
path: |
6868
~/.pods
@@ -132,42 +132,42 @@ runs:
132132
shell: bash
133133

134134
- name: Upload IPA artifact
135-
uses: actions/upload-artifact@v4
135+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
136136
if: ${{ inputs.type == 'experimental' }}
137137
with:
138138
name: ios-build-experimental
139139
path: ios/Rocket.Chat.ipa
140140

141141
- name: Upload IPA artifact
142-
uses: actions/upload-artifact@v4
142+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
143143
if: ${{ inputs.type == 'official' }}
144144
with:
145145
name: ios-build-official
146146
path: ios/Rocket.Chat.ipa
147147

148148
- name: Upload Rocket.Chat.app.dSYM.zip
149-
uses: actions/upload-artifact@v4
149+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
150150
if: ${{ inputs.type == 'experimental' }}
151151
with:
152152
name: ios-build-experimental-dSYM
153153
path: ios/Rocket.Chat.app.dSYM.zip
154154

155155
- name: Upload Rocket.Chat.app.dSYM.zip
156-
uses: actions/upload-artifact@v4
156+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
157157
if: ${{ inputs.type == 'official' }}
158158
with:
159159
name: ios-build-official-dSYM
160160
path: ios/Rocket.Chat.app.dSYM.zip
161161

162162
- name: Upload RocketChatRN/Info.plist
163-
uses: actions/upload-artifact@v4
163+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
164164
if: ${{ inputs.type == 'experimental' }}
165165
with:
166166
name: ios-build-experimental-info-plist
167167
path: ios/RocketChatRN/Info.plist
168168

169169
- name: Upload RocketChatRN/Info.plist
170-
uses: actions/upload-artifact@v4
170+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
171171
if: ${{ inputs.type == 'official' }}
172172
with:
173173
name: ios-build-official-info-plist

‎.github/actions/fetch-supported-versions/action.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ runs:
1313
run: sh ./scripts/fetch-supported-versions.sh
1414

1515
- name: Update supported versions
16-
uses: actions/upload-artifact@v4
16+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
1717
with:
1818
name: supported-versions-${{ inputs.build_name }}
1919
path: ./app-supportedversions.json
20-
20+

‎.github/actions/setup-node/action.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@ description: Setup node and cache node_modules
33
runs:
44
using: "composite"
55
steps:
6-
- uses: actions/setup-node@v4
6+
- uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
77
with:
88
node-version: 'lts/*'
99
cache: 'yarn'
1010

1111
- name: Cache node_modules
12-
uses: actions/cache@v4
12+
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
1313
with:
1414
path: node_modules
15-
key: ${{ runner.os }}-node-modules-${{ hashFiles('**/yarn.lock') }}
15+
key: ${{ runner.os }}-node-modules-${{ hashFiles('**/yarn.lock', 'patches/**') }}
1616
restore-keys: |
17-
${{ runner.os }}-node-modules-${{ hashFiles('**/yarn.lock') }}
17+
${{ runner.os }}-node-modules-${{ hashFiles('**/yarn.lock', 'patches/**') }}
1818
1919
- name: Install JS dependencies
2020
shell: bash

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

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,37 +23,32 @@ runs:
2323
steps:
2424
- name: Download Experimental AAB
2525
if: ${{ inputs.type == 'experimental' }}
26-
uses: actions/download-artifact@v4
26+
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
2727
with:
2828
name: android-aab-experimental
2929
path: android/app/build/outputs/bundle/experimentalRelease/
3030

3131
- name: Download Official AAB
3232
if: ${{ inputs.type == 'official' }}
33-
uses: actions/download-artifact@v4
33+
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
3434
with:
3535
name: android-aab-official
3636
path: android/app/build/outputs/bundle/officialRelease/
3737

3838
- name: Set up Ruby and Bundler
39-
uses: ruby/setup-ruby@v1
39+
uses: ruby/setup-ruby@7372622e62b60b3cb750dcd2b9e32c247ffec26a # v1.302.0
4040
with:
4141
ruby-version: 2.7.7
4242
bundler-cache: true
43-
44-
- name: Install Fastlane
45-
working-directory: android
46-
run: |
47-
bundle install --path gems
48-
shell: bash
43+
working-directory: android
4944

5045
- name: Store the Google service account key
5146
working-directory: android
5247
run: |
5348
echo "${{ inputs.FASTLANE_GOOGLE_SERVICE_ACCOUNT }}" | base64 --decode > service_account.json
5449
shell: bash
5550

56-
- uses: actions/download-artifact@v4
51+
- uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
5752
if: ${{ inputs.trigger == 'develop' }}
5853
with:
5954
name: release-changelog
@@ -109,4 +104,4 @@ runs:
109104
message="**Android Build Available**"$'\n\n'"$version_info"
110105
111106
gh pr comment "$PR_NUMBER" --body "$message"
112-
shell: bash
107+
shell: bash

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

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,29 +23,24 @@ runs:
2323
steps:
2424
- name: Download Experimental AAB
2525
if: ${{ inputs.type == 'experimental' }}
26-
uses: actions/download-artifact@v4
26+
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
2727
with:
2828
name: android-aab-experimental
2929
path: android/app/build/outputs/bundle/experimentalRelease/
3030

3131
- name: Download Official AAB
3232
if: ${{ inputs.type == 'official' }}
33-
uses: actions/download-artifact@v4
33+
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
3434
with:
3535
name: android-aab-official
3636
path: android/app/build/outputs/bundle/officialRelease/
3737

3838
- name: Set up Ruby and Bundler
39-
uses: ruby/setup-ruby@v1
39+
uses: ruby/setup-ruby@7372622e62b60b3cb750dcd2b9e32c247ffec26a # v1.302.0
4040
with:
4141
ruby-version: 2.7.7
4242
bundler-cache: true
43-
44-
- name: Install Fastlane
45-
working-directory: android
46-
run: |
47-
bundle install --path gems
48-
shell: bash
43+
working-directory: android
4944

5045
- name: Store the Google service account key
5146
working-directory: android
@@ -102,4 +97,4 @@ runs:
10297
message="**Android Build Available**"$'\n\n'"$version_info"$'\n\n'"Internal App Sharing: $INTERNAL_SHARING_URL"
10398
10499
gh pr comment "$PR_NUMBER" --body "$message"
105-
shell: bash
100+
shell: bash

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -37,49 +37,49 @@ runs:
3737
using: "composite"
3838
steps:
3939
- name: Download iOS build
40-
uses: actions/download-artifact@v4
40+
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
4141
if: ${{ inputs.type == 'experimental' }}
4242
with:
4343
name: ios-build-experimental
4444
path: ios/
4545

4646
- name: Download iOS build
47-
uses: actions/download-artifact@v4
47+
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
4848
if: ${{ inputs.type == 'official' }}
4949
with:
5050
name: ios-build-official
5151
path: ios/
5252

5353
- name: Download dSYM
54-
uses: actions/download-artifact@v4
54+
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
5555
if: ${{ inputs.type == 'experimental' }}
5656
with:
5757
name: ios-build-experimental-dSYM
5858
path: ios/
5959

6060
- name: Download dSYM
61-
uses: actions/download-artifact@v4
61+
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
6262
if: ${{ inputs.type == 'official' }}
6363
with:
6464
name: ios-build-official-dSYM
6565
path: ios/
6666

6767
- name: Download Info.plist
68-
uses: actions/download-artifact@v4
68+
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
6969
if: ${{ inputs.type == 'experimental' }}
7070
with:
7171
name: ios-build-experimental-info-plist
7272
path: ios/RocketChatRN/
7373

7474
- name: Download Info.plist
75-
uses: actions/download-artifact@v4
75+
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
7676
if: ${{ inputs.type == 'official' }}
7777
with:
7878
name: ios-build-official-info-plist
7979
path: ios/RocketChatRN/
8080

8181
- name: Pod Cache
82-
uses: actions/cache@v4
82+
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
8383
with:
8484
path: |
8585
~/.pods
@@ -89,12 +89,12 @@ runs:
8989
pods-v1-
9090
9191
- name: Set up Xcode
92-
uses: maxim-lobanov/setup-xcode@v1
92+
uses: maxim-lobanov/setup-xcode@ed7a3b1fda3918c0306d1b724322adc0b8cc0a90 # v1.7.0
9393
with:
9494
xcode-version: '26.2.0'
9595

9696
- name: Set up Ruby
97-
uses: ruby/setup-ruby@v1
97+
uses: ruby/setup-ruby@7372622e62b60b3cb750dcd2b9e32c247ffec26a # v1.302.0
9898
with:
9999
ruby-version: 2.7.7
100100
bundler-cache: true
@@ -109,7 +109,7 @@ runs:
109109
yarn pod-install
110110
shell: bash
111111

112-
- uses: actions/download-artifact@v4
112+
- uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
113113
if: ${{ inputs.type == 'official' && inputs.trigger == 'develop' }}
114114
with:
115115
name: release-changelog

‎.github/workflows/build-android.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
BUILD_VERSION: ${{ steps.version.outputs.BUILD_VERSION }}
3030
steps:
3131
- name: Checkout Repository
32-
uses: actions/checkout@v4
32+
uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
3333

3434
- name: Checkout and Setup Node
3535
uses: ./.github/actions/setup-node
@@ -76,7 +76,7 @@ jobs:
7676
if: ${{ inputs.type == 'experimental' && (always() && (needs.upload-hold.result == 'success' || needs.upload-hold.result == 'skipped') && needs.build-android.result == 'success') }}
7777
steps:
7878
- name: Checkout Repository
79-
uses: actions/checkout@v4
79+
uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
8080

8181
- name: Checkout and Setup Node
8282
uses: ./.github/actions/setup-node
@@ -97,7 +97,7 @@ jobs:
9797
if: ${{ inputs.type == 'experimental' && inputs.trigger == 'pr' }}
9898
steps:
9999
- name: Checkout Repository
100-
uses: actions/checkout@v4
100+
uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
101101

102102
- name: Checkout and Setup Node
103103
uses: ./.github/actions/setup-node

‎.github/workflows/build-ios.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
if: ${{ inputs.type == 'experimental' && (always() && (needs.build-hold.result == 'success' || needs.build-hold.result == 'skipped')) }}
2828
steps:
2929
- name: Checkout Repository
30-
uses: actions/checkout@v4
30+
uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
3131

3232
- name: Checkout and Setup Node
3333
uses: ./.github/actions/setup-node
@@ -67,7 +67,7 @@ jobs:
6767
if: ${{ inputs.type == 'experimental' && (always() && (needs.build-ios.result == 'success')) }}
6868
steps:
6969
- name: Checkout Repository
70-
uses: actions/checkout@v4
70+
uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
7171

7272
- name: Setup Node
7373
uses: ./.github/actions/setup-node

0 commit comments

Comments
 (0)