PR comments and etc

* Fixed some build issues * Reactivate ccache for integration tests builds
realm · Jan 24, 2024 · 2dfc2a4 · 2dfc2a4
1 parent 39aefde
commit 2dfc2a4
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 55 deletions.
diff --git a/integration-tests/environments/react-native/ios/Podfile b/integration-tests/environments/react-native/ios/Podfile
@@ -66,6 +66,8 @@ target 'RealmReactNativeTests' do
           # Applying https://github.com/facebook/folly/issues/1470#issuecomment-943123653
           config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= ['$(inherited)', 'FOLLY_HAVE_CLOCK_GETTIME=1']
         end
+        config.build_settings['CC'] = "../../../../../scripts/ccache-clang.sh"
+        config.build_settings['CXX'] = "../../../../../scripts/ccache-clang++.sh"
       end
     end
   end

diff --git a/packages/realm/scripts/ccache-clang++.sh b/packages/realm/scripts/ccache-clang++.sh
diff --git a/packages/realm/scripts/ccache-clang.sh b/packages/realm/scripts/ccache-clang.sh
diff --git a/packages/realm/scripts/cmake-ios.sh b/packages/realm/scripts/cmake-ios.sh
diff --git a/packages/realm/scripts/generate-ios-libs.sh b/packages/realm/scripts/generate-ios-libs.sh
@@ -21,11 +21,11 @@ mkdir -p build
 pushd build
 
 # Get core version
-CORE_VERSION=$(grep "^VERSION=" $BINDGEN_PATH/vendor/realm-core/dependencies.list | cut -d '=' -f2)
-TAR_FILE_NAME=realm-Release-v$CORE_VERSION-$PLATFORM_NAME-devel.tar.gz
+CORE_VERSION=v$(grep "^VERSION=" $BINDGEN_PATH/vendor/realm-core/dependencies.list | cut -d '=' -f2)
+TAR_FILE_NAME=realm-Release-$CORE_VERSION-$PLATFORM_NAME-devel.tar.gz
 
 # There are only Release builds available on the CDN
-CDN_URL="https://static.realm.io/downloads/core/v$CORE_VERSION/$PLATFORM_NAME/Release/$TAR_FILE_NAME"
+CDN_URL="https://static.realm.io/downloads/core/$CORE_VERSION/$PLATFORM_NAME/Release/$TAR_FILE_NAME"
 
 # Check if URL is valid and reachable
 if ! curl --output /dev/null --silent --head --fail "$CDN_URL"; then
@@ -37,7 +37,7 @@ if [ "$BUILD_REALM_CORE" == "1" ]; then
     echo "Building realm-core..."
     pushd $PROJECT_ROOT/bindgen/vendor/realm-core
     env -i PATH=$PATH DEVELOPER_DIR=$DEVELOPER_DIR ./tools/build-apple-device.sh -p $PLATFORM_NAME -c $CONFIGURATION -v $CORE_VERSION -f -DREALM_BUILD_LIB_ONLY=1
-    cp -R _CPack_Packages/$PLATFORM_NAME/TGZ/realm-$CONFIGURATION-v$CORE_VERSION-$PLATFORM_NAME/devel/* $PROJECT_ROOT/react-native/ios/build
+    cp -R _CPack_Packages/$PLATFORM_NAME/TGZ/realm-$CONFIGURATION-$CORE_VERSION-$PLATFORM_NAME/devel/* $PROJECT_ROOT/react-native/ios/build
     popd
 else
     # Download core prebuild and extract