From b32a20ace9a50d728ee2afc9a97f00e6e303d052 Mon Sep 17 00:00:00 2001 From: Kudo Chien Date: Tue, 5 Jul 2022 02:11:49 +0800 Subject: [PATCH] try to workaround requests.git syncing error (#32) --- package.json | 2 +- packages/v8-android-jit-nointl/package.json | 2 +- packages/v8-android-jit/package.json | 2 +- packages/v8-android-nointl/package.json | 2 +- packages/v8-android-tools-linux/package.json | 2 +- packages/v8-android-tools-macos/package.json | 2 +- packages/v8-android/package.json | 2 +- scripts/setup.sh | 11 ++++++++--- 8 files changed, 15 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index e698a6d..83693ce 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "private": true, - "version": "10.100.0", + "version": "10.100.1", "workspaces": [ "packages/*" ], diff --git a/packages/v8-android-jit-nointl/package.json b/packages/v8-android-jit-nointl/package.json index 53e78ab..d2f5d24 100644 --- a/packages/v8-android-jit-nointl/package.json +++ b/packages/v8-android-jit-nointl/package.json @@ -1,6 +1,6 @@ { "name": "v8-android-jit-nointl", - "version": "10.100.0", + "version": "10.100.1", "description": "Pre-build version of V8 to be used by React Native apps", "repository": { "type": "git", diff --git a/packages/v8-android-jit/package.json b/packages/v8-android-jit/package.json index 2b6eb3c..0d9c792 100644 --- a/packages/v8-android-jit/package.json +++ b/packages/v8-android-jit/package.json @@ -1,6 +1,6 @@ { "name": "v8-android-jit", - "version": "10.100.0", + "version": "10.100.1", "description": "Pre-build version of V8 to be used by React Native apps", "repository": { "type": "git", diff --git a/packages/v8-android-nointl/package.json b/packages/v8-android-nointl/package.json index e3b38cc..f696a34 100644 --- a/packages/v8-android-nointl/package.json +++ b/packages/v8-android-nointl/package.json @@ -1,6 +1,6 @@ { "name": "v8-android-nointl", - "version": "10.100.0", + "version": "10.100.1", "description": "Pre-build version of V8 to be used by React Native apps (Non Intl supported version)", "repository": { "type": "git", diff --git a/packages/v8-android-tools-linux/package.json b/packages/v8-android-tools-linux/package.json index 47a5de7..3c1b3c4 100644 --- a/packages/v8-android-tools-linux/package.json +++ b/packages/v8-android-tools-linux/package.json @@ -1,6 +1,6 @@ { "name": "v8-android-tools-linux", - "version": "10.100.0", + "version": "10.100.1", "description": "Tools for v8-android", "repository": { "type": "git", diff --git a/packages/v8-android-tools-macos/package.json b/packages/v8-android-tools-macos/package.json index be61ad9..f6a2a5c 100644 --- a/packages/v8-android-tools-macos/package.json +++ b/packages/v8-android-tools-macos/package.json @@ -1,6 +1,6 @@ { "name": "v8-android-tools-macos", - "version": "10.100.0", + "version": "10.100.1", "description": "Tools for v8-android", "repository": { "type": "git", diff --git a/packages/v8-android/package.json b/packages/v8-android/package.json index da5b043..3237bcf 100644 --- a/packages/v8-android/package.json +++ b/packages/v8-android/package.json @@ -1,6 +1,6 @@ { "name": "v8-android", - "version": "10.100.0", + "version": "10.100.1", "description": "Pre-build version of V8 to be used by React Native apps", "repository": { "type": "git", diff --git a/scripts/setup.sh b/scripts/setup.sh index 61bf7f5..1429c35 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -38,7 +38,9 @@ if [[ ${PLATFORM} = "ios" ]]; then fi if [[ ${PLATFORM} = "android" ]]; then - gclient sync --deps=android ${GCLIENT_SYNC_ARGS} + gclient sync --deps=android ${GCLIENT_SYNC_ARGS} || true + sed -i "s#2c2138e811487b13020eb331482fb991fd399d4e#083aa67a0d3309ebe37eafbe7bfd96c235a019cf#g" v8/DEPS + gclient sync --deps=android # Patch build-deps installer for snapd not available in docker patch -d "${V8_DIR}" -p1 < "${PATCHES_DIR}/prebuild_no_snapd.patch" @@ -66,14 +68,17 @@ if [[ ${PLATFORM} = "android" ]]; then gclient sync # Workaround to install missing android_sdk tools - gclient sync --deps=android ${GCLIENT_SYNC_ARGS} + gclient sync --deps=android installNDK "linux" exit 0 fi if [[ ${PLATFORM} = "macos_android" ]]; then - gclient sync --deps=android ${GCLIENT_SYNC_ARGS} + gclient sync --deps=android ${GCLIENT_SYNC_ARGS} || true + sed -i "" "s#2c2138e811487b13020eb331482fb991fd399d4e#083aa67a0d3309ebe37eafbe7bfd96c235a019cf#g" v8/DEPS + gclient sync --deps=android + installNDK "darwin" exit 0 fi