try to workaround requests.git syncing error (#32)

Kudo · Jul 4, 2022 · b32a20a · b32a20a
1 parent e66f1c8
commit b32a20a
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 10 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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