Skip to content

Commit a05733b

Browse files
Merge branch 'main' into antonis/bump-on-headers
2 parents 3618e59 + 1595a60 commit a05733b

File tree

3 files changed

+17
-15
lines changed

3 files changed

+17
-15
lines changed

package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,10 @@
6060
},
6161
"resolutions": {
6262
"appium-chromedriver@npm:5.6.73/@xmldom/xmldom": "0.8.10",
63+
"fast-xml-parser": "^5.3.6",
6364
"form-data": "4.0.4",
6465
"on-headers": "^1.1.0",
66+
"lodash": "^4.17.23",
6567
"tar-fs": "^3.1.1",
6668
"tar": "^7.5.7"
6769
},

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: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20114,14 +20114,14 @@ __metadata:
2011420114
languageName: node
2011520115
linkType: hard
2011620116

20117-
"fast-xml-parser@npm:^4.0.12, fast-xml-parser@npm:^4.2.4, fast-xml-parser@npm:^4.4.1":
20118-
version: 4.4.1
20119-
resolution: "fast-xml-parser@npm:4.4.1"
20117+
"fast-xml-parser@npm:^5.3.6":
20118+
version: 5.3.7
20119+
resolution: "fast-xml-parser@npm:5.3.7"
2012020120
dependencies:
20121-
strnum: "npm:^1.0.5"
20121+
strnum: ^2.1.2
2012220122
bin:
2012320123
fxparser: src/cli/cli.js
20124-
checksum: f440c01cd141b98789ae777503bcb6727393296094cc82924ae9f88a5b971baa4eec7e65306c7e07746534caa661fc83694ff437d9012dc84dee39dfbfaab947
20124+
checksum: 0bb307bc63a01c079ae28b6b62eeea0007d787e6ab47dfca493f40305f78aeedea2906b2632bf0eb9d4d868e748c77c70393a808441fb5949c9d2e6f8f2825f0
2012520125
languageName: node
2012620126
linkType: hard
2012720127

@@ -24574,10 +24574,10 @@ __metadata:
2457424574
languageName: node
2457524575
linkType: hard
2457624576

24577-
"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":
24578-
version: 4.17.21
24579-
resolution: "lodash@npm:4.17.21"
24580-
checksum: eb835a2e51d381e561e508ce932ea50a8e5a68f4ebdd771ea240d3048244a8d13658acbd502cd4829768c56f2e16bdd4340b9ea141297d472517b83868e677f7
24577+
"lodash@npm:^4.17.23":
24578+
version: 4.17.23
24579+
resolution: "lodash@npm:4.17.23"
24580+
checksum: 7daad39758a72872e94651630fbb54ba76868f904211089721a64516ce865506a759d9ad3d8ff22a2a49a50a09db5d27c36f22762d21766e47e3ba918d6d7bab
2458124581
languageName: node
2458224582
linkType: hard
2458324583

@@ -32577,10 +32577,10 @@ __metadata:
3257732577
languageName: node
3257832578
linkType: hard
3257932579

32580-
"strnum@npm:^1.0.5":
32581-
version: 1.0.5
32582-
resolution: "strnum@npm:1.0.5"
32583-
checksum: 651b2031db5da1bf4a77fdd2f116a8ac8055157c5420f5569f64879133825915ad461513e7202a16d7fec63c54fd822410d0962f8ca12385c4334891b9ae6dd2
32580+
"strnum@npm:^2.1.2":
32581+
version: 2.1.2
32582+
resolution: "strnum@npm:2.1.2"
32583+
checksum: 755e8327ee68201d700169ceee097ea52da7b675f4521442a8dbd1517021f89a91399213c446d1bf3d1123ca1896a76f0ff076d04c88ffe6056e78828ce6f60a
3258432584
languageName: node
3258532585
linkType: hard
3258632586

0 commit comments

Comments
 (0)