diff --git a/.ci_support/linux_64_cuda_compiler_version12.9.yaml b/.ci_support/linux_64_c_compiler_version14c_stdlib_version2.17cuda_compiler_version12.9cxx_compiler_version14.yaml similarity index 99% rename from .ci_support/linux_64_cuda_compiler_version12.9.yaml rename to .ci_support/linux_64_c_compiler_version14c_stdlib_version2.17cuda_compiler_version12.9cxx_compiler_version14.yaml index 02323ab9b..c106947bb 100644 --- a/.ci_support/linux_64_cuda_compiler_version12.9.yaml +++ b/.ci_support/linux_64_c_compiler_version14c_stdlib_version2.17cuda_compiler_version12.9cxx_compiler_version14.yaml @@ -1,5 +1,5 @@ aws_crt_cpp: -- 0.40.1 +- 0.42.3 aws_sdk_cpp: - 1.11.833 azure_core_cpp: diff --git a/.ci_support/linux_64_cuda_compiler_versionNone.yaml b/.ci_support/linux_64_c_compiler_version15c_stdlib_version2.17cuda_compiler_versionNonecxx_compiler_version15.yaml similarity index 97% rename from .ci_support/linux_64_cuda_compiler_versionNone.yaml rename to .ci_support/linux_64_c_compiler_version15c_stdlib_version2.17cuda_compiler_versionNonecxx_compiler_version15.yaml index 44fea9bf5..45687d091 100644 --- a/.ci_support/linux_64_cuda_compiler_versionNone.yaml +++ b/.ci_support/linux_64_c_compiler_version15c_stdlib_version2.17cuda_compiler_versionNonecxx_compiler_version15.yaml @@ -1,5 +1,5 @@ aws_crt_cpp: -- 0.40.1 +- 0.42.3 aws_sdk_cpp: - 1.11.833 azure_core_cpp: @@ -17,7 +17,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '14' +- '15' c_stdlib: - sysroot c_stdlib_version: @@ -35,7 +35,7 @@ cuda_compiler_version_min: cxx_compiler: - gxx cxx_compiler_version: -- '14' +- '15' docker_image: - quay.io/condaforge/linux-anvil-x86_64:alma10 gflags: diff --git a/.ci_support/linux_aarch64_cuda_compiler_version12.9.yaml b/.ci_support/linux_aarch64_c_compiler_version14c_stdlib_version2.17cuda_compiler_version12.9cxx_compiler_version14.yaml similarity index 99% rename from .ci_support/linux_aarch64_cuda_compiler_version12.9.yaml rename to .ci_support/linux_aarch64_c_compiler_version14c_stdlib_version2.17cuda_compiler_version12.9cxx_compiler_version14.yaml index 67a4259eb..e714cc214 100644 --- a/.ci_support/linux_aarch64_cuda_compiler_version12.9.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version14c_stdlib_version2.17cuda_compiler_version12.9cxx_compiler_version14.yaml @@ -1,5 +1,5 @@ aws_crt_cpp: -- 0.40.1 +- 0.42.3 aws_sdk_cpp: - 1.11.833 azure_core_cpp: diff --git a/.ci_support/linux_aarch64_cuda_compiler_versionNone.yaml b/.ci_support/linux_aarch64_c_compiler_version15c_stdlib_version2.17cuda_compiler_versionNonecxx_compiler_version15.yaml similarity index 97% rename from .ci_support/linux_aarch64_cuda_compiler_versionNone.yaml rename to .ci_support/linux_aarch64_c_compiler_version15c_stdlib_version2.17cuda_compiler_versionNonecxx_compiler_version15.yaml index 7a535f7f0..6359dc0e0 100644 --- a/.ci_support/linux_aarch64_cuda_compiler_versionNone.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version15c_stdlib_version2.17cuda_compiler_versionNonecxx_compiler_version15.yaml @@ -1,5 +1,5 @@ aws_crt_cpp: -- 0.40.1 +- 0.42.3 aws_sdk_cpp: - 1.11.833 azure_core_cpp: @@ -17,7 +17,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '14' +- '15' c_stdlib: - sysroot c_stdlib_version: @@ -35,7 +35,7 @@ cuda_compiler_version_min: cxx_compiler: - gxx cxx_compiler_version: -- '14' +- '15' docker_image: - quay.io/condaforge/linux-anvil-x86_64:alma10 gflags: diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index 8cfdd1f25..649266cfb 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -1,5 +1,5 @@ aws_crt_cpp: -- 0.40.1 +- 0.42.3 aws_sdk_cpp: - 1.11.833 azure_core_cpp: @@ -17,7 +17,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '14' +- '15' c_stdlib: - sysroot c_stdlib_version: @@ -33,7 +33,7 @@ cuda_compiler_version_min: cxx_compiler: - gxx cxx_compiler_version: -- '14' +- '15' docker_image: - quay.io/condaforge/linux-anvil-x86_64:alma10 gflags: diff --git a/.ci_support/migrations/libgoogle_cloud38.yaml b/.ci_support/migrations/libgoogle_cloud38.yaml deleted file mode 100644 index fc6f92532..000000000 --- a/.ci_support/migrations/libgoogle_cloud38.yaml +++ /dev/null @@ -1,46 +0,0 @@ -__migrator: - build_number: 1 - commit_message: Rebuild for libgoogle_cloud 3.8 - kind: version - migration_number: 1 -google_cloud_cpp: -- '3.8' -libgoogle_cloud: -- '3.8' -libgoogle_cloud_aiplatform_devel: -- '3.8' -libgoogle_cloud_all_devel: -- '3.8' -libgoogle_cloud_automl_devel: -- '3.8' -libgoogle_cloud_bigquery_devel: -- '3.8' -libgoogle_cloud_bigtable_devel: -- '3.8' -libgoogle_cloud_compute_devel: -- '3.8' -libgoogle_cloud_devel: -- '3.8' -libgoogle_cloud_dialogflow_cx_devel: -- '3.8' -libgoogle_cloud_dialogflow_es_devel: -- '3.8' -libgoogle_cloud_discoveryengine_devel: -- '3.8' -libgoogle_cloud_dlp_devel: -- '3.8' -libgoogle_cloud_iam_devel: -- '3.8' -libgoogle_cloud_oauth2_devel: -- '3.8' -libgoogle_cloud_policytroubleshooter_devel: -- '3.8' -libgoogle_cloud_pubsub_devel: -- '3.8' -libgoogle_cloud_spanner_devel: -- '3.8' -libgoogle_cloud_speech_devel: -- '3.8' -libgoogle_cloud_storage_devel: -- '3.8' -migrator_ts: 1786233804.752991 diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index d2a729699..a6352844b 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: MACOSX_SDK_VERSION: - '12.0' aws_crt_cpp: -- 0.40.1 +- 0.42.3 aws_sdk_cpp: - 1.11.833 azure_core_cpp: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index e93b2f81e..e7508cf8f 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: MACOSX_SDK_VERSION: - '12.0' aws_crt_cpp: -- 0.40.1 +- 0.42.3 aws_sdk_cpp: - 1.11.833 azure_core_cpp: diff --git a/.ci_support/win_64_cuda_compiler_version12.9.yaml b/.ci_support/win_64_cuda_compiler_version12.9.yaml index 429237440..e7094d12e 100644 --- a/.ci_support/win_64_cuda_compiler_version12.9.yaml +++ b/.ci_support/win_64_cuda_compiler_version12.9.yaml @@ -1,5 +1,5 @@ aws_crt_cpp: -- 0.40.1 +- 0.42.3 aws_sdk_cpp: - 1.11.833 azure_core_cpp: diff --git a/.ci_support/win_64_cuda_compiler_versionNone.yaml b/.ci_support/win_64_cuda_compiler_versionNone.yaml index c6da457e1..f46bbbdba 100644 --- a/.ci_support/win_64_cuda_compiler_versionNone.yaml +++ b/.ci_support/win_64_cuda_compiler_versionNone.yaml @@ -1,5 +1,5 @@ aws_crt_cpp: -- 0.40.1 +- 0.42.3 aws_sdk_cpp: - 1.11.833 azure_core_cpp: diff --git a/.github/workflows/conda-build.yml b/.github/workflows/conda-build.yml index 1483470c4..9b5fe86b0 100644 --- a/.github/workflows/conda-build.yml +++ b/.github/workflows/conda-build.yml @@ -22,7 +22,7 @@ jobs: max-parallel: 50 matrix: include: - - CONFIG: linux_64_cuda_compiler_version12.9 + - CONFIG: linux_64_c_compiler_version14c_stdlib_version2.17cuda_compiler_version12.9cxx_compiler_version14 DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma10 STORE_BUILD_ARTIFACTS: False UPLOAD_PACKAGES: True @@ -34,7 +34,7 @@ jobs: resize_partitions: False runs_on: ['ubuntu-latest'] tools_install_dir: ~/miniforge3 - - CONFIG: linux_64_cuda_compiler_versionNone + - CONFIG: linux_64_c_compiler_version15c_stdlib_version2.17cuda_compiler_versionNonecxx_compiler_version15 DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma10 STORE_BUILD_ARTIFACTS: False UPLOAD_PACKAGES: True @@ -46,7 +46,7 @@ jobs: resize_partitions: False runs_on: ['ubuntu-latest'] tools_install_dir: ~/miniforge3 - - CONFIG: linux_aarch64_cuda_compiler_version12.9 + - CONFIG: linux_aarch64_c_compiler_version14c_stdlib_version2.17cuda_compiler_version12.9cxx_compiler_version14 DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma10 STORE_BUILD_ARTIFACTS: False UPLOAD_PACKAGES: True @@ -58,7 +58,7 @@ jobs: resize_partitions: False runs_on: ['ubuntu-latest'] tools_install_dir: ~/miniforge3 - - CONFIG: linux_aarch64_cuda_compiler_versionNone + - CONFIG: linux_aarch64_c_compiler_version15c_stdlib_version2.17cuda_compiler_versionNonecxx_compiler_version15 DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma10 STORE_BUILD_ARTIFACTS: False UPLOAD_PACKAGES: True diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index 06f61b83b..6a6309e57 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -42,7 +42,8 @@ call :start_group "Configuring conda" :: Activate the base conda environment echo Activating environment -call "%MINIFORGE_HOME%\Scripts\activate.bat" +set "CONDA_EXE=%MINIFORGE_HOME%\Scripts\conda.exe" +call "%MINIFORGE_HOME%\condabin\conda.bat" activate "%MINIFORGE_HOME%" :: Configure the solver set "CONDA_SOLVER=libmamba" if !errorlevel! neq 0 exit /b !errorlevel! diff --git a/README.md b/README.md index e7d298050..fc77e5259 100644 --- a/README.md +++ b/README.md @@ -146,17 +146,17 @@ Current build status - + - + diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 80e0b7225..4b585bbc2 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -41,7 +41,7 @@ source: folder: cpp/submodules/parquet-testing build: - number: 21 + number: 22 # for cuda support, building with one version is enough to be compatible with # all later versions, since arrow is only using libcuda, and not libcudart. skip: true # [cuda_compiler_version not in ("None", cuda_compiler_version_min)]
VariantStatus
linux_aarch64_cuda_compiler_version12.9linux_aarch64_c_compiler_version14c_stdlib_version2.17cuda_compiler_version12.9cxx_compiler_version14 - variant + variant
linux_aarch64_cuda_compiler_versionNonelinux_aarch64_c_compiler_version15c_stdlib_version2.17cuda_compiler_versionNonecxx_compiler_version15 - variant + variant