Skip to content

Commit feb0004

Browse files
lucas-zimermanlucas-zimerman
authored
Merge branch 'main' into antonis/bump-diff
2 parents 85ac816 + 7f7c2ff commit feb0004

7 files changed

Lines changed: 36 additions & 42 deletions

File tree

‎.github/workflows/e2e-v2.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,11 @@ jobs:
4848
platform: ["ios", "android"]
4949
include:
5050
- platform: ios
51-
runs-on: ["ghcr.io/cirruslabs/macos-tahoe-xcode:26.2.0", "runner_group_id:12"]
51+
runs-on: ["ghcr.io/cirruslabs/macos-tahoe-xcode:26.2.0", "runner_group_id:10"]
5252
name: iOS
5353
appPlain: performance-tests/test-app-plain.ipa
5454
- platform: android
55-
runs-on: ["ghcr.io/cirruslabs/ubuntu-runner-amd64:22.04", "runner_group_id:12"]
55+
runs-on: ["ghcr.io/cirruslabs/ubuntu-runner-amd64:22.04", "runner_group_id:10"]
5656
name: Android
5757
appPlain: performance-tests/TestAppPlain/android/app/build/outputs/apk/release/app-release.apk
5858
steps:
@@ -199,13 +199,13 @@ jobs:
199199
# Use Xcode 16 for older RN versions
200200
- platform: ios
201201
rn-version: '0.71.19'
202-
runs-on: ["ghcr.io/cirruslabs/macos-sequoia-xcode:16.4", "runner_group_id:12"]
202+
runs-on: ["ghcr.io/cirruslabs/macos-sequoia-xcode:16.4", "runner_group_id:10"]
203203
# Use Xcode 26 for newer RN versions (0.83.0)
204204
- platform: ios
205205
rn-version: '0.84.0'
206-
runs-on: ["ghcr.io/cirruslabs/macos-tahoe-xcode:26.2.0", "runner_group_id:12"]
206+
runs-on: ["ghcr.io/cirruslabs/macos-tahoe-xcode:26.2.0", "runner_group_id:10"]
207207
- platform: android
208-
runs-on: ["ghcr.io/cirruslabs/ubuntu-runner-amd64:22.04", "runner_group_id:12"]
208+
runs-on: ["ghcr.io/cirruslabs/ubuntu-runner-amd64:22.04", "runner_group_id:10"]
209209
exclude:
210210
# exclude JSC for new RN versions (keeping the matrix manageable)
211211
- rn-version: '0.84.0'
@@ -334,7 +334,7 @@ jobs:
334334
rn-version: '0.84.0'
335335
runs-on: macos-26
336336
- platform: android
337-
runs-on: ["ghcr.io/cirruslabs/ubuntu-runner-amd64:22.04", "runner_group_id:12"]
337+
runs-on: ["ghcr.io/cirruslabs/ubuntu-runner-amd64:22.04", "runner_group_id:10"]
338338

339339
steps:
340340
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6

‎.github/workflows/sample-application-expo.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ jobs:
4343
build-type: ['dev', 'production']
4444
include:
4545
- platform: ios
46-
runs-on: ["ghcr.io/cirruslabs/macos-sequoia-xcode:16.4", "runner_group_id:12"]
46+
runs-on: ["ghcr.io/cirruslabs/macos-sequoia-xcode:16.4", "runner_group_id:10"]
4747
- platform: android
48-
runs-on: ["ghcr.io/cirruslabs/ubuntu-runner-amd64:22.04", "runner_group_id:12"]
48+
runs-on: ["ghcr.io/cirruslabs/ubuntu-runner-amd64:22.04", "runner_group_id:10"]
4949
- platform: web
50-
runs-on: ["ghcr.io/cirruslabs/ubuntu-runner-amd64:22.04", "runner_group_id:12"]
50+
runs-on: ["ghcr.io/cirruslabs/ubuntu-runner-amd64:22.04", "runner_group_id:10"]
5151
exclude:
5252
- platform: 'android'
5353
ios-use-frameworks: 'dynamic-frameworks'

‎.github/workflows/sample-application.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,11 @@ jobs:
5252
build-type: ['dev', 'production']
5353
include:
5454
- platform: ios
55-
runs-on: ["ghcr.io/cirruslabs/macos-sequoia-xcode:16.4", "runner_group_id:12"]
55+
runs-on: ["ghcr.io/cirruslabs/macos-sequoia-xcode:16.4", "runner_group_id:10"]
5656
- platform: macos
57-
runs-on: ["ghcr.io/cirruslabs/macos-sequoia-xcode:16.4", "runner_group_id:12"]
57+
runs-on: ["ghcr.io/cirruslabs/macos-sequoia-xcode:16.4", "runner_group_id:10"]
5858
- platform: android
59-
runs-on: ["ghcr.io/cirruslabs/ubuntu-runner-amd64:22.04", "runner_group_id:12"]
59+
runs-on: ["ghcr.io/cirruslabs/ubuntu-runner-amd64:22.04", "runner_group_id:10"]
6060
exclude:
6161
- platform: 'android'
6262
ios-use-frameworks: 'dynamic-frameworks'

‎.github/workflows/testflight.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515

1616
upload_to_testflight:
1717
name: Build and Upload React Native Sample to Testflight
18-
runs-on: ["ghcr.io/cirruslabs/macos-tahoe-xcode:26.2.0", "runner_group_id:12"]
18+
runs-on: ["ghcr.io/cirruslabs/macos-tahoe-xcode:26.2.0", "runner_group_id:10"]
1919
needs: [diff_check]
2020
if: ${{ needs.diff_check.outputs.skip_ci != 'true' }}
2121
steps:

‎package.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,10 @@
6161
"resolutions": {
6262
"appium-chromedriver@npm:5.6.73/@xmldom/xmldom": "0.8.10",
6363
"diff": "^5.2.2",
64+
"fast-xml-parser": "^5.3.6",
6465
"form-data": "4.0.4",
66+
"qs": "^6.14.2",
67+
"lodash": "^4.17.23",
6568
"tar-fs": "^3.1.1",
6669
"tar": "^7.5.7"
6770
},

‎packages/core/scripts/sentry-xcode.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,11 @@ if [ "$SENTRY_DISABLE_AUTO_UPLOAD" != true ]; then
5757
echo "$SENTRY_XCODE_COMMAND_OUTPUT" | awk '{print "output: sentry-cli - " $0}'
5858
else
5959
if [ "$SENTRY_ALLOW_FAILURE" == true ]; then
60+
echo "$SENTRY_XCODE_COMMAND_OUTPUT" | awk '{print "warning: sentry-cli - " $0}'
6061
echo "warning: sentry-cli - Source maps upload failed, but continuing build because SENTRY_ALLOW_FAILURE=true"
61-
echo "warning: sentry-cli - $SENTRY_XCODE_COMMAND_OUTPUT"
6262
else
63+
echo "$SENTRY_XCODE_COMMAND_OUTPUT" | awk '{print "error: sentry-cli - " $0}'
6364
echo "error: sentry-cli - To disable source maps auto upload, set SENTRY_DISABLE_AUTO_UPLOAD=true in your environment variables. Or to allow failing upload, set SENTRY_ALLOW_FAILURE=true"
64-
echo "error: sentry-cli - $SENTRY_XCODE_COMMAND_OUTPUT"
6565
exitCode=1
6666
fi
6767
fi

‎yarn.lock‎

Lines changed: 18 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -20107,14 +20107,14 @@ __metadata:
2010720107
languageName: node
2010820108
linkType: hard
2010920109

20110-
"fast-xml-parser@npm:^4.0.12, fast-xml-parser@npm:^4.2.4, fast-xml-parser@npm:^4.4.1":
20111-
version: 4.4.1
20112-
resolution: "fast-xml-parser@npm:4.4.1"
20110+
"fast-xml-parser@npm:^5.3.6":
20111+
version: 5.3.7
20112+
resolution: "fast-xml-parser@npm:5.3.7"
2011320113
dependencies:
20114-
strnum: "npm:^1.0.5"
20114+
strnum: ^2.1.2
2011520115
bin:
2011620116
fxparser: src/cli/cli.js
20117-
checksum: f440c01cd141b98789ae777503bcb6727393296094cc82924ae9f88a5b971baa4eec7e65306c7e07746534caa661fc83694ff437d9012dc84dee39dfbfaab947
20117+
checksum: 0bb307bc63a01c079ae28b6b62eeea0007d787e6ab47dfca493f40305f78aeedea2906b2632bf0eb9d4d868e748c77c70393a808441fb5949c9d2e6f8f2825f0
2011820118
languageName: node
2011920119
linkType: hard
2012020120

@@ -24567,10 +24567,10 @@ __metadata:
2456724567
languageName: node
2456824568
linkType: hard
2456924569

24570-
"lodash@npm:4.17.21, lodash@npm:^4.0.0, lodash@npm:^4.17.11, lodash@npm:^4.17.12, lodash@npm:^4.17.14, lodash@npm:^4.17.15, lodash@npm:^4.17.19, lodash@npm:^4.17.21, lodash@npm:^4.17.4, lodash@npm:^4.2.1":
24571-
version: 4.17.21
24572-
resolution: "lodash@npm:4.17.21"
24573-
checksum: eb835a2e51d381e561e508ce932ea50a8e5a68f4ebdd771ea240d3048244a8d13658acbd502cd4829768c56f2e16bdd4340b9ea141297d472517b83868e677f7
24570+
"lodash@npm:^4.17.23":
24571+
version: 4.17.23
24572+
resolution: "lodash@npm:4.17.23"
24573+
checksum: 7daad39758a72872e94651630fbb54ba76868f904211089721a64516ce865506a759d9ad3d8ff22a2a49a50a09db5d27c36f22762d21766e47e3ba918d6d7bab
2457424574
languageName: node
2457524575
linkType: hard
2457624576

@@ -28968,21 +28968,12 @@ __metadata:
2896828968
languageName: node
2896928969
linkType: hard
2897028970

28971-
"qs@npm:6.11.0":
28972-
version: 6.11.0
28973-
resolution: "qs@npm:6.11.0"
28974-
dependencies:
28975-
side-channel: ^1.0.4
28976-
checksum: 6e1f29dd5385f7488ec74ac7b6c92f4d09a90408882d0c208414a34dd33badc1a621019d4c799a3df15ab9b1d0292f97c1dd71dc7c045e69f81a8064e5af7297
28977-
languageName: node
28978-
linkType: hard
28979-
28980-
"qs@npm:6.13.0":
28981-
version: 6.13.0
28982-
resolution: "qs@npm:6.13.0"
28971+
"qs@npm:^6.14.2":
28972+
version: 6.15.0
28973+
resolution: "qs@npm:6.15.0"
2898328974
dependencies:
28984-
side-channel: ^1.0.6
28985-
checksum: e9404dc0fc2849245107108ce9ec2766cde3be1b271de0bf1021d049dc5b98d1a2901e67b431ac5509f865420a7ed80b7acb3980099fe1c118a1c5d2e1432ad8
28975+
side-channel: ^1.1.0
28976+
checksum: 65e797e3747fa1092e062da7b3e0684a9194e07ccab3a9467d416d2579d2feab0adf3aa4b94446e9f69ba7426589a8728f78a10a549308c97563a79d1c0d8595
2898628977
languageName: node
2898728978
linkType: hard
2898828979

@@ -32570,10 +32561,10 @@ __metadata:
3257032561
languageName: node
3257132562
linkType: hard
3257232563

32573-
"strnum@npm:^1.0.5":
32574-
version: 1.0.5
32575-
resolution: "strnum@npm:1.0.5"
32576-
checksum: 651b2031db5da1bf4a77fdd2f116a8ac8055157c5420f5569f64879133825915ad461513e7202a16d7fec63c54fd822410d0962f8ca12385c4334891b9ae6dd2
32564+
"strnum@npm:^2.1.2":
32565+
version: 2.1.2
32566+
resolution: "strnum@npm:2.1.2"
32567+
checksum: 755e8327ee68201d700169ceee097ea52da7b675f4521442a8dbd1517021f89a91399213c446d1bf3d1123ca1896a76f0ff076d04c88ffe6056e78828ce6f60a
3257732568
languageName: node
3257832569
linkType: hard
3257932570

0 commit comments

Comments
 (0)