diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index b1ecebb9..a516aa51 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -17,7 +17,7 @@ cxx_compiler_version: docker_image: - condaforge/linux-anvil-cos7-x86_64 icu: -- '75' +- '78' nodejs: - '*' openssl: diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index 51eccdb7..5f2bbc54 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -17,7 +17,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-x86_64:alma9 icu: -- '75' +- '78' nodejs: - '*' openssl: diff --git a/.ci_support/migrations/brotli12.yaml b/.ci_support/migrations/brotli12.yaml deleted file mode 100644 index bfc19e1e..00000000 --- a/.ci_support/migrations/brotli12.yaml +++ /dev/null @@ -1,14 +0,0 @@ -__migrator: - build_number: 1 - commit_message: Rebuild for brotli 1.2 - kind: version - migration_number: 1 -brotli: -- '1.2' -libbrotlicommon: -- '1.2' -libbrotlidec: -- '1.2' -libbrotlienc: -- '1.2' -migrator_ts: 1761598392.2337856 diff --git a/.ci_support/migrations/icu78.yaml b/.ci_support/migrations/icu78.yaml new file mode 100644 index 00000000..16b84dc2 --- /dev/null +++ b/.ci_support/migrations/icu78.yaml @@ -0,0 +1,8 @@ +__migrator: + build_number: 1 + commit_message: Rebuild for icu 78 + kind: version + migration_number: 1 +icu: +- '78' +migrator_ts: 1766302854.3781085 diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 17adc1f4..88872e0a 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -19,7 +19,7 @@ cxx_compiler: cxx_compiler_version: - '19' icu: -- '75' +- '78' macos_machine: - x86_64-apple-darwin13.4.0 nodejs: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index c5ee2b2b..0289109c 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -19,7 +19,7 @@ cxx_compiler: cxx_compiler_version: - '19' icu: -- '75' +- '78' macos_machine: - arm64-apple-darwin20.0.0 nodejs: diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 361edeb2..bac7141a 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -63,6 +63,25 @@ if [[ "${sha:-}" == "" ]]; then sha=$(git rev-parse HEAD) fi +if [[ "${OSX_SDK_DIR:-}" == "" ]]; then + if [[ "${CI:-}" == "" ]]; then + echo "Please set OSX_SDK_DIR to a directory where SDKs can be downloaded to. Aborting" + exit 1 + else + export OSX_SDK_DIR=/opt/conda-sdks + /usr/bin/sudo mkdir -p "${OSX_SDK_DIR}" + /usr/bin/sudo chown "${USER}" "${OSX_SDK_DIR}" + fi +else + if tmpf=$(mktemp -p "$OSX_SDK_DIR" tmp.XXXXXXXX 2>/dev/null); then + rm -f "$tmpf" + echo "OSX_SDK_DIR is writeable without sudo, continuing" + else + echo "User-provided OSX_SDK_DIR is not writeable for current user! Aborting" + exit 1 + fi +fi + echo -e "\n\nRunning the build setup script." source run_conda_forge_build_setup diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 108bf1c2..d45d57d2 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -22,7 +22,7 @@ source: - patches/0004-Forward-ceilf-floorf.patch # [unix] build: - number: 0 + number: 1 # Prefix replacement breaks in the binary embedded configurations. detect_binary_files_with_prefix: false run_exports: