Skip to content

Commit d2bc203

Browse files
authored
Merge branch 'add/allow-pasting-images-to-composer' into allow-pasting-images-into-composer
2 parents ab6869c + b12468a commit d2bc203

File tree

210 files changed

+2697
-464
lines changed

Some content is hidden

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

210 files changed

+2697
-464
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,36 @@
1-
### 🔗 Issue Link
2-
_Jira or Github issue link, if applicable._
1+
### 🔗 Issue Links
2+
3+
_Provide all Linear and/or Github issues related to this PR, if applicable._
34

45
### 🎯 Goal
56

67
_Describe why we are making this change._
78

9+
### 📝 Summary
10+
11+
_Provide bullet points with the most important changes in the codebase._
12+
813
### 🛠 Implementation
914

10-
_Provide a description of the implementation._
15+
_Provide a detailed description of the implementation and explain your decisions if you find them relevant._
16+
17+
### 🎨 Showcase
1118

12-
### 🧪 Testing
19+
_Add relevant screenshots and/or videos/gifs to easily see what this PR changes, if applicable._
1320

14-
_Describe the steps how this change can be tested (or why it can't be tested)._
21+
| Before | After |
22+
| ------ | ----- |
23+
| img | img |
1524

16-
### 🎨 Changes
25+
### 🧪 Manual Testing Notes
1726

18-
_Add relevant screenshots or videos showcasing the changes._
27+
_Explain how this change can be tested manually, if applicable._
1928

20-
### ☑️ Checklist
29+
### ☑️ Contributor Checklist
2130

2231
- [ ] I have signed the [Stream CLA](https://docs.google.com/forms/d/e/1FAIpQLScFKsKkAJI7mhCr7K9rEIOpqIDThrWxuvxnwUq2XkHyG154vQ/viewform) (required)
32+
- [x] This change should be manually QAed
2333
- [ ] Changelog is updated with client-facing changes
34+
- [ ] Changelog is updated with new localization keys
2435
- [ ] New code is covered by unit tests
25-
- [ ] Affected documentation updated (docusaurus, tutorial, CMS (task created)
36+
- [ ] Documentation has been updated in the `docs-content` repo

.github/workflows/cron-checks.yml

Lines changed: 21 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ env:
1818
jobs:
1919
build-test-app-and-frameworks:
2020
name: Build Test App and Frameworks
21-
runs-on: macos-14
21+
runs-on: macos-15
2222
steps:
2323
- uses: actions/[email protected]
2424
- uses: ./.github/actions/ruby-cache
@@ -41,15 +41,15 @@ jobs:
4141
strategy:
4242
matrix:
4343
include:
44-
- ios: 18.1
45-
xcode: 16.1
44+
- ios: 18.2
45+
xcode: 16.2
4646
os: macos-15
4747
device: "iPhone 16 Pro"
4848
setup_runtime: false
4949
- ios: 17.5
5050
xcode: 15.4
5151
os: macos-15
52-
device: "iPhone 14 Pro"
52+
device: "iPhone 15 Pro"
5353
setup_runtime: false
5454
- ios: 16.4
5555
xcode: 15.3 # fails on 15.4
@@ -90,16 +90,6 @@ jobs:
9090
- name: Allure TestOps Launch Removal
9191
if: cancelled()
9292
run: bundle exec fastlane allure_launch_removal launch_id:$LAUNCH_ID
93-
- uses: 8398a7/action-slack@v3
94-
with:
95-
status: ${{ job.status }}
96-
text: "You shall not pass!"
97-
job_name: "${{ github.workflow }}: ${{ github.job }}"
98-
fields: message,commit,author,action,workflow,job,took
99-
env:
100-
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
101-
MATRIX_CONTEXT: ${{ toJson(matrix) }}
102-
if: failure() && github.event_name == 'schedule'
10393
- name: Parse xcresult
10494
if: failure()
10595
run: |
@@ -137,21 +127,10 @@ jobs:
137127
run: bundle exec fastlane build_demo
138128
env:
139129
XCODE_VERSION: ${{ matrix.xcode }}
140-
- uses: 8398a7/action-slack@v3
141-
with:
142-
status: ${{ job.status }}
143-
text: "You shall not pass!"
144-
job_name: "${{ github.workflow }}: ${{ github.job }}"
145-
fields: message,commit,author,action,workflow,job,took
146-
env:
147-
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
148-
MATRIX_CONTEXT: ${{ toJson(matrix) }}
149-
if: failure() && github.event_name == 'schedule'
150130

151-
build-xcode15:
152-
name: Build SDKs (Xcode 15.0)
131+
build-old-xcode:
132+
name: Build SDKs (Xcode 15)
153133
runs-on: macos-15
154-
if: ${{ github.event_name != 'push' && github.event.inputs.snapshots != 'true' }}
155134
env:
156135
XCODE_VERSION: "15.4"
157136
steps:
@@ -185,3 +164,18 @@ jobs:
185164
- run: bundle exec fastlane rubocop
186165
- run: ./Scripts/run-linter.sh
187166
- run: bundle exec fastlane pod_lint
167+
168+
slack:
169+
name: Slack Report
170+
runs-on: ubuntu-latest
171+
needs: [test-e2e-debug, build-test-app-and-frameworks, build-apps, build-old-xcode, automated-code-review]
172+
if: failure() && github.event_name == 'schedule'
173+
steps:
174+
- uses: 8398a7/action-slack@v3
175+
with:
176+
status: cancelled
177+
text: "You shall not pass!"
178+
job_name: "${{ github.workflow }}: ${{ github.job }}"
179+
fields: repo,commit,author,workflow
180+
env:
181+
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_NIGHTLY_CHECKS }}
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
name: Record Snapshots
2+
3+
on:
4+
workflow_dispatch:
5+
6+
jobs:
7+
record:
8+
name: Record
9+
runs-on: ubuntu-latest
10+
steps:
11+
- uses: actions/[email protected]
12+
- run: gh workflow run smoke-checks.yml --ref "${GITHUB_REF#refs/heads/}" -f record_snapshots=true
13+
timeout-minutes: 5
14+
env:
15+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release-merge.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
jobs:
1010
merge-comment:
1111
name: Merge release to main
12-
runs-on: macos-14
12+
runs-on: macos-15
1313
if: github.event_name == 'workflow_dispatch' || (github.event.issue.pull_request && github.event.issue.state == 'open' && github.event.comment.body == '/merge release')
1414
steps:
1515
- name: Connect Bot

.github/workflows/release-publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
jobs:
77
release:
88
name: Publish new release
9-
runs-on: macos-13
9+
runs-on: macos-15
1010
steps:
1111
- name: Connect Bot
1212
uses: webfactory/[email protected]

.github/workflows/release-start.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,3 @@ jobs:
3232
GITHUB_TOKEN: ${{ secrets.CI_BOT_GITHUB_TOKEN }}
3333
MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
3434
APPSTORE_API_KEY: ${{ secrets.APPSTORE_API_KEY }}
35-
XCODE_VERSION: "15.4"

.github/workflows/sdk-size-metrics.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ env:
1515
jobs:
1616
sdk_size:
1717
name: Metrics
18-
runs-on: macos-14
18+
runs-on: macos-15
1919
env:
2020
GITHUB_TOKEN: '${{ secrets.CI_BOT_GITHUB_TOKEN }}'
2121
steps:

.github/workflows/smoke-checks.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ on:
88

99
workflow_dispatch:
1010
inputs:
11-
snapshots:
12-
description: 'Should Snapshots be recorded on CI?'
11+
record_snapshots:
12+
description: 'Record snapshots on CI?'
1313
type: boolean
1414
required: false
1515
default: false
@@ -20,7 +20,7 @@ concurrency:
2020

2121
env:
2222
HOMEBREW_NO_INSTALL_CLEANUP: 1 # Disable cleanup for homebrew, we don't need it on CI
23-
IOS_SIMULATOR_DEVICE: "iPhone 16 Pro (18.1)"
23+
IOS_SIMULATOR_DEVICE: "iPhone 16 Pro (18.2)"
2424
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2525
GITHUB_PR_NUM: ${{ github.event.pull_request.number }}
2626

@@ -47,7 +47,7 @@ jobs:
4747
automated-code-review:
4848
name: Automated Code Review
4949
runs-on: macos-15
50-
if: ${{ github.event.inputs.snapshots != 'true' }}
50+
if: ${{ github.event.inputs.record_snapshots != 'true' }}
5151
env:
5252
XCODE_VERSION: "15.4"
5353
steps:
@@ -64,9 +64,9 @@ jobs:
6464
run: bundle exec fastlane pod_lint
6565

6666
build-xcode15:
67-
name: Build SDKs (Xcode 15.0)
67+
name: Build SDKs (Xcode 15)
6868
runs-on: macos-15
69-
if: ${{ github.event.inputs.snapshots != 'true' }}
69+
if: ${{ github.event.inputs.record_snapshots != 'true' }}
7070
env:
7171
XCODE_VERSION: "15.4"
7272
steps:
@@ -99,12 +99,12 @@ jobs:
9999
INSTALL_YEETD: true
100100
INSTALL_SONAR: true
101101
- name: Run UI Tests (Debug)
102-
run: bundle exec fastlane test_ui device:"${{ env.IOS_SIMULATOR_DEVICE }}" record:${{ github.event.inputs.snapshots }}
102+
run: bundle exec fastlane test_ui device:"${{ env.IOS_SIMULATOR_DEVICE }}" record:"${{ github.event.inputs.record_snapshots }}"
103103
timeout-minutes: 120
104104
env:
105105
GITHUB_TOKEN: ${{ secrets.CI_BOT_GITHUB_TOKEN }} # to open a PR
106106
- name: Run Sonar analysis
107-
if: ${{ github.event.inputs.snapshots != 'true' }}
107+
if: ${{ github.event.inputs.record_snapshots != 'true' }}
108108
run: bundle exec fastlane sonar_upload
109109
env:
110110
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
@@ -133,8 +133,8 @@ jobs:
133133

134134
allure_testops_launch:
135135
name: Launch Allure TestOps
136-
runs-on: macos-13
137-
if: ${{ github.event.inputs.snapshots != 'true' }}
136+
runs-on: macos-15
137+
if: ${{ github.event.inputs.record_snapshots != 'true' }}
138138
needs: build-test-app-and-frameworks
139139
outputs:
140140
launch_id: ${{ steps.get_launch_id.outputs.launch_id }}
@@ -153,7 +153,7 @@ jobs:
153153
test-e2e-debug:
154154
name: Test E2E UI (Debug)
155155
runs-on: macos-15
156-
if: ${{ github.event.inputs.snapshots != 'true' }}
156+
if: ${{ github.event.inputs.record_snapshots != 'true' }}
157157
needs:
158158
- allure_testops_launch
159159
- build-test-app-and-frameworks
@@ -207,8 +207,8 @@ jobs:
207207
208208
build-apps:
209209
name: Build Demo App
210-
runs-on: macos-14
211-
if: ${{ github.event.inputs.snapshots != 'true' }}
210+
runs-on: macos-15
211+
if: ${{ github.event.inputs.record_snapshots != 'true' }}
212212
needs: build-test-app-and-frameworks
213213
steps:
214214
- uses: actions/[email protected]

.github/workflows/testflight.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ env:
1515

1616
jobs:
1717
deploy:
18-
runs-on: macos-14
18+
runs-on: macos-15
1919
steps:
2020
- name: Connect Bot
2121
uses: webfactory/[email protected]
@@ -37,8 +37,7 @@ jobs:
3737
with:
3838
status: ${{ job.status }}
3939
text: "You shall not pass!"
40-
fields: message,commit,author,action,workflow,job,took
40+
fields: repo,commit,author,workflow
4141
env:
4242
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
43-
MATRIX_CONTEXT: ${{ toJson(matrix) }}
4443
if: failure()

.github/workflows/update-copyright.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ env:
1313
jobs:
1414
copyright:
1515
name: Copyright
16-
runs-on: macos-13
16+
runs-on: macos-15
1717
steps:
1818
- uses: actions/[email protected]
1919
- uses: ./.github/actions/ruby-cache
@@ -26,8 +26,7 @@ jobs:
2626
status: ${{ job.status }}
2727
text: "You shall not pass!"
2828
job_name: "${{ github.workflow }}: ${{ github.job }}"
29-
fields: message,commit,author,action,workflow,job,took
29+
fields: repo,commit,author,workflow
3030
env:
3131
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
32-
MATRIX_CONTEXT: ${{ toJson(matrix) }}
3332
if: failure()

0 commit comments

Comments
 (0)