Merge pull request #13 from regro-cf-autotick-bot/0.18.0_h7e65ff

traversaro · web-flow · commit 28eda413c8e6 · 2024-08-20T15:52:14.000+02:00
librerun-sdk v0.18.0 and switch macos builds to link with lld
diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml
diff --git a/.ci_support/linux_64_libarrow14.yaml b/.ci_support/linux_64_libarrow14.yaml
@@ -22,6 +22,8 @@ libarrow:
 - '14'
 rust_compiler:
 - rust
+rust_compiler_version:
+- 1.76.0
 target_platform:
 - linux-64
 zip_keys:
diff --git a/.ci_support/linux_64_libarrow15.yaml b/.ci_support/linux_64_libarrow15.yaml
@@ -22,6 +22,8 @@ libarrow:
 - '15'
 rust_compiler:
 - rust
+rust_compiler_version:
+- 1.76.0
 target_platform:
 - linux-64
 zip_keys:
diff --git a/.ci_support/linux_64_libarrow16.1.yaml b/.ci_support/linux_64_libarrow16.1.yaml
@@ -22,6 +22,8 @@ libarrow:
 - '16.1'
 rust_compiler:
 - rust
+rust_compiler_version:
+- 1.76.0
 target_platform:
 - linux-64
 zip_keys:
diff --git a/.ci_support/linux_64_libarrow17.0.yaml b/.ci_support/linux_64_libarrow17.0.yaml
@@ -22,6 +22,8 @@ libarrow:
 - '17.0'
 rust_compiler:
 - rust
+rust_compiler_version:
+- 1.76.0
 target_platform:
 - linux-64
 zip_keys:
diff --git a/.ci_support/linux_aarch64_libarrow14.yaml b/.ci_support/linux_aarch64_libarrow14.yaml
@@ -26,6 +26,8 @@ libarrow:
 - '14'
 rust_compiler:
 - rust
+rust_compiler_version:
+- 1.76.0
 target_platform:
 - linux-aarch64
 zip_keys:
diff --git a/.ci_support/linux_aarch64_libarrow15.yaml b/.ci_support/linux_aarch64_libarrow15.yaml
@@ -26,6 +26,8 @@ libarrow:
 - '15'
 rust_compiler:
 - rust
+rust_compiler_version:
+- 1.76.0
 target_platform:
 - linux-aarch64
 zip_keys:
diff --git a/.ci_support/linux_aarch64_libarrow16.1.yaml b/.ci_support/linux_aarch64_libarrow16.1.yaml
@@ -26,6 +26,8 @@ libarrow:
 - '16.1'
 rust_compiler:
 - rust
+rust_compiler_version:
+- 1.76.0
 target_platform:
 - linux-aarch64
 zip_keys:
diff --git a/.ci_support/linux_aarch64_libarrow17.0.yaml b/.ci_support/linux_aarch64_libarrow17.0.yaml
@@ -26,6 +26,8 @@ libarrow:
 - '17.0'
 rust_compiler:
 - rust
+rust_compiler_version:
+- 1.76.0
 target_platform:
 - linux-aarch64
 zip_keys:
diff --git a/.ci_support/linux_ppc64le_libarrow14.yaml b/.ci_support/linux_ppc64le_libarrow14.yaml
@@ -22,6 +22,8 @@ libarrow:
 - '14'
 rust_compiler:
 - rust
+rust_compiler_version:
+- 1.76.0
 target_platform:
 - linux-ppc64le
 zip_keys:
diff --git a/.ci_support/linux_ppc64le_libarrow15.yaml b/.ci_support/linux_ppc64le_libarrow15.yaml
@@ -22,6 +22,8 @@ libarrow:
 - '15'
 rust_compiler:
 - rust
+rust_compiler_version:
+- 1.76.0
 target_platform:
 - linux-ppc64le
 zip_keys:
diff --git a/.ci_support/linux_ppc64le_libarrow16.1.yaml b/.ci_support/linux_ppc64le_libarrow16.1.yaml
@@ -22,6 +22,8 @@ libarrow:
 - '16.1'
 rust_compiler:
 - rust
+rust_compiler_version:
+- 1.76.0
 target_platform:
 - linux-ppc64le
 zip_keys:
diff --git a/.ci_support/linux_ppc64le_libarrow17.0.yaml b/.ci_support/linux_ppc64le_libarrow17.0.yaml
@@ -22,6 +22,8 @@ libarrow:
 - '17.0'
 rust_compiler:
 - rust
+rust_compiler_version:
+- 1.76.0
 target_platform:
 - linux-ppc64le
 zip_keys:
diff --git a/.ci_support/migrations/libarrow170.yaml b/.ci_support/migrations/libarrow170.yaml
diff --git a/.ci_support/osx_64_libarrow14.yaml b/.ci_support/osx_64_libarrow14.yaml
@@ -24,6 +24,8 @@ macos_machine:
 - x86_64-apple-darwin13.4.0
 rust_compiler:
 - rust
+rust_compiler_version:
+- 1.76.0
 target_platform:
 - osx-64
 zip_keys:
diff --git a/.ci_support/osx_64_libarrow15.yaml b/.ci_support/osx_64_libarrow15.yaml
@@ -24,6 +24,8 @@ macos_machine:
 - x86_64-apple-darwin13.4.0
 rust_compiler:
 - rust
+rust_compiler_version:
+- 1.76.0
 target_platform:
 - osx-64
 zip_keys:
diff --git a/.ci_support/osx_64_libarrow16.1.yaml b/.ci_support/osx_64_libarrow16.1.yaml
@@ -24,6 +24,8 @@ macos_machine:
 - x86_64-apple-darwin13.4.0
 rust_compiler:
 - rust
+rust_compiler_version:
+- 1.76.0
 target_platform:
 - osx-64
 zip_keys:
diff --git a/.ci_support/osx_64_libarrow17.0.yaml b/.ci_support/osx_64_libarrow17.0.yaml
@@ -24,6 +24,8 @@ macos_machine:
 - x86_64-apple-darwin13.4.0
 rust_compiler:
 - rust
+rust_compiler_version:
+- 1.76.0
 target_platform:
 - osx-64
 zip_keys:
diff --git a/.ci_support/osx_arm64_libarrow14.yaml b/.ci_support/osx_arm64_libarrow14.yaml
@@ -5,7 +5,7 @@ MACOSX_SDK_VERSION:
 c_compiler:
 - clang
 c_compiler_version:
-- '16'
+- '17'
 c_stdlib:
 - macosx_deployment_target
 c_stdlib_version:
@@ -17,13 +17,15 @@ channel_targets:
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '16'
+- '17'
 libarrow:
 - '14'
 macos_machine:
 - arm64-apple-darwin20.0.0
 rust_compiler:
 - rust
+rust_compiler_version:
+- 1.76.0
 target_platform:
 - osx-arm64
 zip_keys:
diff --git a/.ci_support/osx_arm64_libarrow15.yaml b/.ci_support/osx_arm64_libarrow15.yaml
@@ -5,7 +5,7 @@ MACOSX_SDK_VERSION:
 c_compiler:
 - clang
 c_compiler_version:
-- '16'
+- '17'
 c_stdlib:
 - macosx_deployment_target
 c_stdlib_version:
@@ -17,13 +17,15 @@ channel_targets:
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '16'
+- '17'
 libarrow:
 - '15'
 macos_machine:
 - arm64-apple-darwin20.0.0
 rust_compiler:
 - rust
+rust_compiler_version:
+- 1.76.0
 target_platform:
 - osx-arm64
 zip_keys:
diff --git a/.ci_support/osx_arm64_libarrow16.1.yaml b/.ci_support/osx_arm64_libarrow16.1.yaml
@@ -5,7 +5,7 @@ MACOSX_SDK_VERSION:
 c_compiler:
 - clang
 c_compiler_version:
-- '16'
+- '17'
 c_stdlib:
 - macosx_deployment_target
 c_stdlib_version:
@@ -17,13 +17,15 @@ channel_targets:
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '16'
+- '17'
 libarrow:
 - '16.1'
 macos_machine:
 - arm64-apple-darwin20.0.0
 rust_compiler:
 - rust
+rust_compiler_version:
+- 1.76.0
 target_platform:
 - osx-arm64
 zip_keys:
diff --git a/.ci_support/osx_arm64_libarrow17.0.yaml b/.ci_support/osx_arm64_libarrow17.0.yaml
@@ -5,7 +5,7 @@ MACOSX_SDK_VERSION:
 c_compiler:
 - clang
 c_compiler_version:
-- '16'
+- '17'
 c_stdlib:
 - macosx_deployment_target
 c_stdlib_version:
@@ -17,13 +17,15 @@ channel_targets:
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '16'
+- '17'
 libarrow:
 - '17.0'
 macos_machine:
 - arm64-apple-darwin20.0.0
 rust_compiler:
 - rust
+rust_compiler_version:
+- 1.76.0
 target_platform:
 - osx-arm64
 zip_keys:
diff --git a/.ci_support/win_64_libarrow14.yaml b/.ci_support/win_64_libarrow14.yaml
@@ -12,5 +12,7 @@ libarrow:
 - '14'
 rust_compiler:
 - rust
+rust_compiler_version:
+- 1.76.0
 target_platform:
 - win-64
diff --git a/.ci_support/win_64_libarrow15.yaml b/.ci_support/win_64_libarrow15.yaml
@@ -12,5 +12,7 @@ libarrow:
 - '15'
 rust_compiler:
 - rust
+rust_compiler_version:
+- 1.76.0
 target_platform:
 - win-64
diff --git a/.ci_support/win_64_libarrow16.1.yaml b/.ci_support/win_64_libarrow16.1.yaml
@@ -12,5 +12,7 @@ libarrow:
 - '16.1'
 rust_compiler:
 - rust
+rust_compiler_version:
+- 1.76.0
 target_platform:
 - win-64
diff --git a/.ci_support/win_64_libarrow17.0.yaml b/.ci_support/win_64_libarrow17.0.yaml
@@ -12,5 +12,7 @@ libarrow:
 - '17.0'
 rust_compiler:
 - rust
+rust_compiler_version:
+- 1.76.0
 target_platform:
 - win-64
diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh
diff --git a/build-locally.py b/build-locally.py
diff --git a/recipe/build.sh b/recipe/build.sh
@@ -16,6 +16,12 @@ cargo-bundle-licenses --format yaml --output THIRDPARTY.yml
 # The CI environment variable means something specific to Rerun. Unset it.
 unset CI
 
+if [[ "${target_platform}" == osx-* ]]; then
+  export CMAKE_LINKER_TYPE="LLD"
+else
+  export CMAKE_LINKER_TYPE="DEFAULT"
+fi
+
 mkdir build_cxx
 cd build_cxx
 
@@ -24,8 +30,8 @@ cmake ${CMAKE_ARGS} -GNinja .. \
       -DBUILD_SHARED_LIBS:BOOL=ON \
       -DRERUN_ARROW_LINK_SHARED:BOOL=ON \
       -DRERUN_DOWNLOAD_AND_BUILD_ARROW:BOOL=OFF \
-      -DRERUN_INSTALL_RERUN_C:BOOL=OFF
-
+      -DRERUN_INSTALL_RERUN_C:BOOL=OFF \
+      -DCMAKE_LINKER_TYPE:STRING=${CMAKE_LINKER_TYPE}
 cmake --build . --config Release
 cmake --build . --config Release --target install
 
diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml
@@ -1,3 +1,8 @@
 # Needed for Metal, the hardware acceleration api for osx
 MACOSX_SDK_VERSION:        # [osx and x86_64]
   - "11.0"                 # [osx and x86_64]
+
+# Workaround for https://github.com/rerun-io/rerun/issues/7216
+# Use the same version specified in https://github.com/rerun-io/rerun/blob/0.18.0/rust-toolchain#L8
+rust_compiler_version:
+  - 1.76.0
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
