Merge pull request #244 from jdblischak/drop-libcurl-7

Drop libcurl 7 variants
conda-forge · Mar 1, 2024 · 1eb0100 · 1eb0100
2 parents a7508b6 + 85c0992
commit 1eb0100
Show file tree

Hide file tree

Showing 24 changed files with 65 additions and 395 deletions.
diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml
diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml
diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml
diff --git a/...port/linux_64_gcsgcs_enabledlibcurl8.yaml → .ci_support/linux_64_.yaml b/...port/linux_64_gcsgcs_enabledlibcurl8.yaml → .ci_support/linux_64_.yaml
@@ -1,3 +1,7 @@
+aws_crt_cpp:
+- 0.26.2
+aws_sdk_cpp:
+- 1.11.267
 bzip2:
 - '1'
 cdt_name:
@@ -12,8 +16,6 @@ cxx_compiler_version:
 - '12'
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
-gcs:
-- gcs_enabled
 libabseil:
 - '20230802'
 libcurl:
@@ -30,9 +32,6 @@ openssl:
 - '3'
 target_platform:
 - linux-64
-zip_keys:
-- - gcs
-  - libcurl
 zlib:
 - '1.2'
 zstd:

diff --git a/.ci_support/linux_64_gcsgcs_disabledlibcurl7.yaml b/.ci_support/linux_64_gcsgcs_disabledlibcurl7.yaml
diff --git a/...linux_aarch64_gcsgcs_enabledlibcurl8.yaml → .ci_support/linux_aarch64_.yaml b/...linux_aarch64_gcsgcs_enabledlibcurl8.yaml → .ci_support/linux_aarch64_.yaml
@@ -1,5 +1,9 @@
 BUILD:
 - aarch64-conda_cos7-linux-gnu
+aws_crt_cpp:
+- 0.26.2
+aws_sdk_cpp:
+- 1.11.267
 bzip2:
 - '1'
 cdt_arch:
@@ -16,8 +20,6 @@ cxx_compiler_version:
 - '12'
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
-gcs:
-- gcs_enabled
 libabseil:
 - '20230802'
 libcurl:
@@ -34,9 +36,6 @@ openssl:
 - '3'
 target_platform:
 - linux-aarch64
-zip_keys:
-- - gcs
-  - libcurl
 zlib:
 - '1.2'
 zstd:

diff --git a/.ci_support/linux_aarch64_gcsgcs_disabledlibcurl7.yaml b/.ci_support/linux_aarch64_gcsgcs_disabledlibcurl7.yaml
diff --git a/...linux_ppc64le_gcsgcs_enabledlibcurl8.yaml → .ci_support/linux_ppc64le_.yaml b/...linux_ppc64le_gcsgcs_enabledlibcurl8.yaml → .ci_support/linux_ppc64le_.yaml
@@ -1,3 +1,7 @@
+aws_crt_cpp:
+- 0.26.2
+aws_sdk_cpp:
+- 1.11.267
 bzip2:
 - '1'
 cdt_name:
@@ -12,8 +16,6 @@ cxx_compiler_version:
 - '12'
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
-gcs:
-- gcs_enabled
 libabseil:
 - '20230802'
 libcurl:
@@ -30,9 +32,6 @@ openssl:
 - '3'
 target_platform:
 - linux-ppc64le
-zip_keys:
-- - gcs
-  - libcurl
 zlib:
 - '1.2'
 zstd:

diff --git a/.ci_support/linux_ppc64le_gcsgcs_disabledlibcurl7.yaml b/.ci_support/linux_ppc64le_gcsgcs_disabledlibcurl7.yaml
diff --git a/...upport/osx_64_gcsgcs_enabledlibcurl8.yaml → .ci_support/osx_64_.yaml b/...upport/osx_64_gcsgcs_enabledlibcurl8.yaml → .ci_support/osx_64_.yaml
@@ -2,6 +2,10 @@ MACOSX_DEPLOYMENT_TARGET:
 - '10.14'
 MACOSX_SDK_VERSION:
 - '10.15'
+aws_crt_cpp:
+- 0.26.2
+aws_sdk_cpp:
+- 1.11.267
 bzip2:
 - '1'
 channel_sources:
@@ -12,8 +16,6 @@ cxx_compiler:
 - clangxx
 cxx_compiler_version:
 - '16'
-gcs:
-- gcs_enabled
 libabseil:
 - '20230802'
 libcurl:
@@ -32,9 +34,6 @@ openssl:
 - '3'
 target_platform:
 - osx-64
-zip_keys:
-- - gcs
-  - libcurl
 zlib:
 - '1.2'
 zstd:

diff --git a/.ci_support/osx_64_gcsgcs_disabledlibcurl7.yaml b/.ci_support/osx_64_gcsgcs_disabledlibcurl7.yaml
diff --git a/...ort/osx_arm64_gcsgcs_enabledlibcurl8.yaml → .ci_support/osx_arm64_.yaml b/...ort/osx_arm64_gcsgcs_enabledlibcurl8.yaml → .ci_support/osx_arm64_.yaml
@@ -1,5 +1,9 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '11.0'
+aws_crt_cpp:
+- 0.26.2
+aws_sdk_cpp:
+- 1.11.267
 bzip2:
 - '1'
 channel_sources:
@@ -10,8 +14,6 @@ cxx_compiler:
 - clangxx
 cxx_compiler_version:
 - '16'
-gcs:
-- gcs_enabled
 libabseil:
 - '20230802'
 libcurl:
@@ -30,9 +32,6 @@ openssl:
 - '3'
 target_platform:
 - osx-arm64
-zip_keys:
-- - gcs
-  - libcurl
 zlib:
 - '1.2'
 zstd: