Skip to content

Commit 81ca22a

Browse files
committed
fix unexpected separator, update .yml files
1 parent 71a4319 commit 81ca22a

3 files changed

Lines changed: 16 additions & 17 deletions

File tree

.github/workflows/e2e-detox-android.yml

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
env:
2121
GRADLE_OPTS: >-
2222
-Dorg.gradle.jvmargs=-Xmx6g --XX:MaxMetaspaceSize=1g -Dfile.encoding=UTF-8
23-
_JAVA_OPTIONS: "-Xmx2g"
23+
JAVA_TOOL_OPTIONS: "-Xmx2g"
2424

2525
steps:
2626
- uses: actions/checkout@v4
@@ -97,27 +97,23 @@ jobs:
9797
-no-snapshot -no-snapshot-save -wipe-data
9898
disable-animations: true
9999
script: |
100-
adb kill-server || true
100+
cd e2e/apps/react-native-oidc
101+
101102
adb start-server || true
102-
adb wait-for-device || true
103-
adb devices
103+
adb wait-for-device
104+
105+
for i in ${seq 1 150}; do
106+
BOOT="$(adb shell getprop sys.boot_completed 2>dev/null | tr -d '\r' || true)"
104107
105-
for i in {1..150}; do
106-
state="$(adb get-state 2>dev/null || true)"
107-
boot="$(adb shell getprop sys.boot_completed 2>dev/null | tr -d '\r' || true)"
108-
echo "adb_state=${state}, boot_completed=${boot}"
109-
if [ "${state}" = "device" ] && [ "${boot}" = "1" ]; then
110-
echo "Emulator is ready"
108+
if [ "$BOOT" = "1" ]; then
109+
echo "Emulator booted"
111110
break
112111
fi
113-
if [ $state != "device" ] && ((i % 20 == 0)); then
114-
adb kill-server || true
115-
adb start-server || true
116-
fi
117112
sleep 2
118113
done
119114
120-
adb shell getprop sys.boot_completed || true
115+
adb devices
116+
121117
adb shell settings put global window_animation_scale 0 || true
122118
adb shell settings put global transition_animation_scale 0 || true
123119
adb shell settings put global animator_duration_scale 0 || true

.github/workflows/e2e-detox-ios.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,9 @@ jobs:
7373
pod install --repo-update
7474
fi
7575
76+
echo "------ list ios root ---------"
77+
ls -la .
78+
7679
cd ..
7780
7881
echo "------ workspaces -------"
@@ -87,7 +90,7 @@ jobs:
8790
echo "Detected workspace: ${WORKSPACE}"
8891
8992
echo "------ toolchain umbrella -------"
90-
ls -la ios/Pods/Headers/Public/React-Core/React-Core-umbrella || true
93+
ls -la ios/Pods/Headers/Public/React-Core|| true
9194
echo "--------------------------------"
9295
9396
- name: Boot simulator

packages/react-native/ios/webCrypto/WebCryptoNativeBridgeHelpers.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ extension WebCryptoNativeBridge{
333333

334334
func parseEcPkcs8(
335335
_ pkcs8Data: Data
336-
) throws -> (namedCurve: String, data: Data, ) {
336+
) throws -> (namedCurve: String, data: Data) {
337337
var reader = DERReader(data: pkcs8Data)
338338
var topSeq = try reader.readSequence()
339339

0 commit comments

Comments
 (0)