diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index eb3ef7f..e7f6047 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,52 +8,52 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_abseil_cpp20210324.2grpc_cpp1.45openssl1.1.1: - CONFIG: linux_64_abseil_cpp20210324.2grpc_cpp1.45openssl1.1.1 + linux_64_grpc_cpp1.46openssl1.1.1: + CONFIG: linux_64_grpc_cpp1.46openssl1.1.1 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_abseil_cpp20210324.2grpc_cpp1.45openssl3: - CONFIG: linux_64_abseil_cpp20210324.2grpc_cpp1.45openssl3 + linux_64_grpc_cpp1.46openssl3: + CONFIG: linux_64_grpc_cpp1.46openssl3 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_abseil_cpp20211102.0grpc_cpp1.46openssl1.1.1: - CONFIG: linux_64_abseil_cpp20211102.0grpc_cpp1.46openssl1.1.1 + linux_64_grpc_cpp1.47openssl1.1.1: + CONFIG: linux_64_grpc_cpp1.47openssl1.1.1 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_abseil_cpp20211102.0grpc_cpp1.46openssl3: - CONFIG: linux_64_abseil_cpp20211102.0grpc_cpp1.46openssl3 + linux_64_grpc_cpp1.47openssl3: + CONFIG: linux_64_grpc_cpp1.47openssl3 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_abseil_cpp20210324.2grpc_cpp1.45openssl1.1.1: - CONFIG: linux_aarch64_abseil_cpp20210324.2grpc_cpp1.45openssl1.1.1 + linux_aarch64_grpc_cpp1.46openssl1.1.1: + CONFIG: linux_aarch64_grpc_cpp1.46openssl1.1.1 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_abseil_cpp20210324.2grpc_cpp1.45openssl3: - CONFIG: linux_aarch64_abseil_cpp20210324.2grpc_cpp1.45openssl3 + linux_aarch64_grpc_cpp1.46openssl3: + CONFIG: linux_aarch64_grpc_cpp1.46openssl3 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_abseil_cpp20211102.0grpc_cpp1.46openssl1.1.1: - CONFIG: linux_aarch64_abseil_cpp20211102.0grpc_cpp1.46openssl1.1.1 + linux_aarch64_grpc_cpp1.47openssl1.1.1: + CONFIG: linux_aarch64_grpc_cpp1.47openssl1.1.1 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_abseil_cpp20211102.0grpc_cpp1.46openssl3: - CONFIG: linux_aarch64_abseil_cpp20211102.0grpc_cpp1.46openssl3 + linux_aarch64_grpc_cpp1.47openssl3: + CONFIG: linux_aarch64_grpc_cpp1.47openssl3 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_abseil_cpp20210324.2grpc_cpp1.45openssl1.1.1: - CONFIG: linux_ppc64le_abseil_cpp20210324.2grpc_cpp1.45openssl1.1.1 + linux_ppc64le_grpc_cpp1.46openssl1.1.1: + CONFIG: linux_ppc64le_grpc_cpp1.46openssl1.1.1 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_abseil_cpp20210324.2grpc_cpp1.45openssl3: - CONFIG: linux_ppc64le_abseil_cpp20210324.2grpc_cpp1.45openssl3 + linux_ppc64le_grpc_cpp1.46openssl3: + CONFIG: linux_ppc64le_grpc_cpp1.46openssl3 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_abseil_cpp20211102.0grpc_cpp1.46openssl1.1.1: - CONFIG: linux_ppc64le_abseil_cpp20211102.0grpc_cpp1.46openssl1.1.1 + linux_ppc64le_grpc_cpp1.47openssl1.1.1: + CONFIG: linux_ppc64le_grpc_cpp1.47openssl1.1.1 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_abseil_cpp20211102.0grpc_cpp1.46openssl3: - CONFIG: linux_ppc64le_abseil_cpp20211102.0grpc_cpp1.46openssl3 + linux_ppc64le_grpc_cpp1.47openssl3: + CONFIG: linux_ppc64le_grpc_cpp1.47openssl3 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index ce68ef5..9af541b 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -8,29 +8,29 @@ jobs: vmImage: macOS-11 strategy: matrix: - osx_64_abseil_cpp20210324.2grpc_cpp1.45openssl1.1.1: - CONFIG: osx_64_abseil_cpp20210324.2grpc_cpp1.45openssl1.1.1 + osx_64_grpc_cpp1.46openssl1.1.1: + CONFIG: osx_64_grpc_cpp1.46openssl1.1.1 UPLOAD_PACKAGES: 'True' - osx_64_abseil_cpp20210324.2grpc_cpp1.45openssl3: - CONFIG: osx_64_abseil_cpp20210324.2grpc_cpp1.45openssl3 + osx_64_grpc_cpp1.46openssl3: + CONFIG: osx_64_grpc_cpp1.46openssl3 UPLOAD_PACKAGES: 'True' - osx_64_abseil_cpp20211102.0grpc_cpp1.46openssl1.1.1: - CONFIG: osx_64_abseil_cpp20211102.0grpc_cpp1.46openssl1.1.1 + osx_64_grpc_cpp1.47openssl1.1.1: + CONFIG: osx_64_grpc_cpp1.47openssl1.1.1 UPLOAD_PACKAGES: 'True' - osx_64_abseil_cpp20211102.0grpc_cpp1.46openssl3: - CONFIG: osx_64_abseil_cpp20211102.0grpc_cpp1.46openssl3 + osx_64_grpc_cpp1.47openssl3: + CONFIG: osx_64_grpc_cpp1.47openssl3 UPLOAD_PACKAGES: 'True' - osx_arm64_abseil_cpp20210324.2grpc_cpp1.45openssl1.1.1: - CONFIG: osx_arm64_abseil_cpp20210324.2grpc_cpp1.45openssl1.1.1 + osx_arm64_grpc_cpp1.46openssl1.1.1: + CONFIG: osx_arm64_grpc_cpp1.46openssl1.1.1 UPLOAD_PACKAGES: 'True' - osx_arm64_abseil_cpp20210324.2grpc_cpp1.45openssl3: - CONFIG: osx_arm64_abseil_cpp20210324.2grpc_cpp1.45openssl3 + osx_arm64_grpc_cpp1.46openssl3: + CONFIG: osx_arm64_grpc_cpp1.46openssl3 UPLOAD_PACKAGES: 'True' - osx_arm64_abseil_cpp20211102.0grpc_cpp1.46openssl1.1.1: - CONFIG: osx_arm64_abseil_cpp20211102.0grpc_cpp1.46openssl1.1.1 + osx_arm64_grpc_cpp1.47openssl1.1.1: + CONFIG: osx_arm64_grpc_cpp1.47openssl1.1.1 UPLOAD_PACKAGES: 'True' - osx_arm64_abseil_cpp20211102.0grpc_cpp1.46openssl3: - CONFIG: osx_arm64_abseil_cpp20211102.0grpc_cpp1.46openssl3 + osx_arm64_grpc_cpp1.47openssl3: + CONFIG: osx_arm64_grpc_cpp1.47openssl3 UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index f42c3f7..5c71971 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -8,17 +8,17 @@ jobs: vmImage: windows-2019 strategy: matrix: - win_64_abseil_cpp20210324.2grpc_cpp1.45openssl1.1.1: - CONFIG: win_64_abseil_cpp20210324.2grpc_cpp1.45openssl1.1.1 + win_64_grpc_cpp1.46openssl1.1.1: + CONFIG: win_64_grpc_cpp1.46openssl1.1.1 UPLOAD_PACKAGES: 'True' - win_64_abseil_cpp20210324.2grpc_cpp1.45openssl3: - CONFIG: win_64_abseil_cpp20210324.2grpc_cpp1.45openssl3 + win_64_grpc_cpp1.46openssl3: + CONFIG: win_64_grpc_cpp1.46openssl3 UPLOAD_PACKAGES: 'True' - win_64_abseil_cpp20211102.0grpc_cpp1.46openssl1.1.1: - CONFIG: win_64_abseil_cpp20211102.0grpc_cpp1.46openssl1.1.1 + win_64_grpc_cpp1.47openssl1.1.1: + CONFIG: win_64_grpc_cpp1.47openssl1.1.1 UPLOAD_PACKAGES: 'True' - win_64_abseil_cpp20211102.0grpc_cpp1.46openssl3: - CONFIG: win_64_abseil_cpp20211102.0grpc_cpp1.46openssl3 + win_64_grpc_cpp1.47openssl3: + CONFIG: win_64_grpc_cpp1.47openssl3 UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: diff --git a/.ci_support/linux_64_abseil_cpp20211102.0grpc_cpp1.46openssl1.1.1.yaml b/.ci_support/linux_64_grpc_cpp1.46openssl1.1.1.yaml similarity index 87% rename from .ci_support/linux_64_abseil_cpp20211102.0grpc_cpp1.46openssl1.1.1.yaml rename to .ci_support/linux_64_grpc_cpp1.46openssl1.1.1.yaml index 3dc5c2d..e89ed90 100644 --- a/.ci_support/linux_64_abseil_cpp20211102.0grpc_cpp1.46openssl1.1.1.yaml +++ b/.ci_support/linux_64_grpc_cpp1.46openssl1.1.1.yaml @@ -1,5 +1,3 @@ -abseil_cpp: -- '20211102.0' c_compiler: - gcc c_compiler_version: @@ -18,6 +16,8 @@ docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 grpc_cpp: - '1.46' +libabseil: +- '20220623.0' libcrc32c: - '1.1' libcurl: @@ -29,10 +29,12 @@ openssl: pin_run_as_build: libcurl: max_pin: x + zlib: + max_pin: x.x target_platform: - linux-64 zip_keys: -- - abseil_cpp - - grpc_cpp - - c_compiler_version - cxx_compiler_version +zlib: +- '1.2' diff --git a/.ci_support/linux_64_abseil_cpp20211102.0grpc_cpp1.46openssl3.yaml b/.ci_support/linux_64_grpc_cpp1.46openssl3.yaml similarity index 87% rename from .ci_support/linux_64_abseil_cpp20211102.0grpc_cpp1.46openssl3.yaml rename to .ci_support/linux_64_grpc_cpp1.46openssl3.yaml index 17a5cdb..117f8b7 100644 --- a/.ci_support/linux_64_abseil_cpp20211102.0grpc_cpp1.46openssl3.yaml +++ b/.ci_support/linux_64_grpc_cpp1.46openssl3.yaml @@ -1,5 +1,3 @@ -abseil_cpp: -- '20211102.0' c_compiler: - gcc c_compiler_version: @@ -18,6 +16,8 @@ docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 grpc_cpp: - '1.46' +libabseil: +- '20220623.0' libcrc32c: - '1.1' libcurl: @@ -29,10 +29,12 @@ openssl: pin_run_as_build: libcurl: max_pin: x + zlib: + max_pin: x.x target_platform: - linux-64 zip_keys: -- - abseil_cpp - - grpc_cpp - - c_compiler_version - cxx_compiler_version +zlib: +- '1.2' diff --git a/.ci_support/linux_64_abseil_cpp20210324.2grpc_cpp1.45openssl1.1.1.yaml b/.ci_support/linux_64_grpc_cpp1.47openssl1.1.1.yaml similarity index 85% rename from .ci_support/linux_64_abseil_cpp20210324.2grpc_cpp1.45openssl1.1.1.yaml rename to .ci_support/linux_64_grpc_cpp1.47openssl1.1.1.yaml index 8914bc0..957fddd 100644 --- a/.ci_support/linux_64_abseil_cpp20210324.2grpc_cpp1.45openssl1.1.1.yaml +++ b/.ci_support/linux_64_grpc_cpp1.47openssl1.1.1.yaml @@ -1,5 +1,3 @@ -abseil_cpp: -- '20210324.2' c_compiler: - gcc c_compiler_version: @@ -17,7 +15,9 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 grpc_cpp: -- '1.45' +- '1.47' +libabseil: +- '20220623.0' libcrc32c: - '1.1' libcurl: @@ -29,10 +29,12 @@ openssl: pin_run_as_build: libcurl: max_pin: x + zlib: + max_pin: x.x target_platform: - linux-64 zip_keys: -- - abseil_cpp - - grpc_cpp - - c_compiler_version - cxx_compiler_version +zlib: +- '1.2' diff --git a/.ci_support/linux_64_abseil_cpp20210324.2grpc_cpp1.45openssl3.yaml b/.ci_support/linux_64_grpc_cpp1.47openssl3.yaml similarity index 85% rename from .ci_support/linux_64_abseil_cpp20210324.2grpc_cpp1.45openssl3.yaml rename to .ci_support/linux_64_grpc_cpp1.47openssl3.yaml index cb91a8c..cca2f3a 100644 --- a/.ci_support/linux_64_abseil_cpp20210324.2grpc_cpp1.45openssl3.yaml +++ b/.ci_support/linux_64_grpc_cpp1.47openssl3.yaml @@ -1,5 +1,3 @@ -abseil_cpp: -- '20210324.2' c_compiler: - gcc c_compiler_version: @@ -17,7 +15,9 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 grpc_cpp: -- '1.45' +- '1.47' +libabseil: +- '20220623.0' libcrc32c: - '1.1' libcurl: @@ -29,10 +29,12 @@ openssl: pin_run_as_build: libcurl: max_pin: x + zlib: + max_pin: x.x target_platform: - linux-64 zip_keys: -- - abseil_cpp - - grpc_cpp - - c_compiler_version - cxx_compiler_version +zlib: +- '1.2' diff --git a/.ci_support/linux_aarch64_abseil_cpp20211102.0grpc_cpp1.46openssl1.1.1.yaml b/.ci_support/linux_aarch64_grpc_cpp1.46openssl1.1.1.yaml similarity index 88% rename from .ci_support/linux_aarch64_abseil_cpp20211102.0grpc_cpp1.46openssl1.1.1.yaml rename to .ci_support/linux_aarch64_grpc_cpp1.46openssl1.1.1.yaml index fc416cb..b59d04c 100644 --- a/.ci_support/linux_aarch64_abseil_cpp20211102.0grpc_cpp1.46openssl1.1.1.yaml +++ b/.ci_support/linux_aarch64_grpc_cpp1.46openssl1.1.1.yaml @@ -1,7 +1,5 @@ BUILD: - aarch64-conda_cos7-linux-gnu -abseil_cpp: -- '20211102.0' c_compiler: - gcc c_compiler_version: @@ -22,6 +20,8 @@ docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 grpc_cpp: - '1.46' +libabseil: +- '20220623.0' libcrc32c: - '1.1' libcurl: @@ -33,10 +33,12 @@ openssl: pin_run_as_build: libcurl: max_pin: x + zlib: + max_pin: x.x target_platform: - linux-aarch64 zip_keys: -- - abseil_cpp - - grpc_cpp - - c_compiler_version - cxx_compiler_version +zlib: +- '1.2' diff --git a/.ci_support/linux_aarch64_abseil_cpp20211102.0grpc_cpp1.46openssl3.yaml b/.ci_support/linux_aarch64_grpc_cpp1.46openssl3.yaml similarity index 88% rename from .ci_support/linux_aarch64_abseil_cpp20211102.0grpc_cpp1.46openssl3.yaml rename to .ci_support/linux_aarch64_grpc_cpp1.46openssl3.yaml index 2862ba7..f918743 100644 --- a/.ci_support/linux_aarch64_abseil_cpp20211102.0grpc_cpp1.46openssl3.yaml +++ b/.ci_support/linux_aarch64_grpc_cpp1.46openssl3.yaml @@ -1,7 +1,5 @@ BUILD: - aarch64-conda_cos7-linux-gnu -abseil_cpp: -- '20211102.0' c_compiler: - gcc c_compiler_version: @@ -22,6 +20,8 @@ docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 grpc_cpp: - '1.46' +libabseil: +- '20220623.0' libcrc32c: - '1.1' libcurl: @@ -33,10 +33,12 @@ openssl: pin_run_as_build: libcurl: max_pin: x + zlib: + max_pin: x.x target_platform: - linux-aarch64 zip_keys: -- - abseil_cpp - - grpc_cpp - - c_compiler_version - cxx_compiler_version +zlib: +- '1.2' diff --git a/.ci_support/linux_aarch64_abseil_cpp20210324.2grpc_cpp1.45openssl1.1.1.yaml b/.ci_support/linux_aarch64_grpc_cpp1.47openssl1.1.1.yaml similarity index 87% rename from .ci_support/linux_aarch64_abseil_cpp20210324.2grpc_cpp1.45openssl1.1.1.yaml rename to .ci_support/linux_aarch64_grpc_cpp1.47openssl1.1.1.yaml index 98efbe6..b748a47 100644 --- a/.ci_support/linux_aarch64_abseil_cpp20210324.2grpc_cpp1.45openssl1.1.1.yaml +++ b/.ci_support/linux_aarch64_grpc_cpp1.47openssl1.1.1.yaml @@ -1,7 +1,5 @@ BUILD: - aarch64-conda_cos7-linux-gnu -abseil_cpp: -- '20210324.2' c_compiler: - gcc c_compiler_version: @@ -21,7 +19,9 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 grpc_cpp: -- '1.45' +- '1.47' +libabseil: +- '20220623.0' libcrc32c: - '1.1' libcurl: @@ -33,10 +33,12 @@ openssl: pin_run_as_build: libcurl: max_pin: x + zlib: + max_pin: x.x target_platform: - linux-aarch64 zip_keys: -- - abseil_cpp - - grpc_cpp - - c_compiler_version - cxx_compiler_version +zlib: +- '1.2' diff --git a/.ci_support/linux_aarch64_abseil_cpp20210324.2grpc_cpp1.45openssl3.yaml b/.ci_support/linux_aarch64_grpc_cpp1.47openssl3.yaml similarity index 87% rename from .ci_support/linux_aarch64_abseil_cpp20210324.2grpc_cpp1.45openssl3.yaml rename to .ci_support/linux_aarch64_grpc_cpp1.47openssl3.yaml index d0a5626..d1de3f9 100644 --- a/.ci_support/linux_aarch64_abseil_cpp20210324.2grpc_cpp1.45openssl3.yaml +++ b/.ci_support/linux_aarch64_grpc_cpp1.47openssl3.yaml @@ -1,7 +1,5 @@ BUILD: - aarch64-conda_cos7-linux-gnu -abseil_cpp: -- '20210324.2' c_compiler: - gcc c_compiler_version: @@ -21,7 +19,9 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 grpc_cpp: -- '1.45' +- '1.47' +libabseil: +- '20220623.0' libcrc32c: - '1.1' libcurl: @@ -33,10 +33,12 @@ openssl: pin_run_as_build: libcurl: max_pin: x + zlib: + max_pin: x.x target_platform: - linux-aarch64 zip_keys: -- - abseil_cpp - - grpc_cpp - - c_compiler_version - cxx_compiler_version +zlib: +- '1.2' diff --git a/.ci_support/linux_ppc64le_abseil_cpp20211102.0grpc_cpp1.46openssl1.1.1.yaml b/.ci_support/linux_ppc64le_grpc_cpp1.46openssl1.1.1.yaml similarity index 87% rename from .ci_support/linux_ppc64le_abseil_cpp20211102.0grpc_cpp1.46openssl1.1.1.yaml rename to .ci_support/linux_ppc64le_grpc_cpp1.46openssl1.1.1.yaml index 8d13736..31156d1 100644 --- a/.ci_support/linux_ppc64le_abseil_cpp20211102.0grpc_cpp1.46openssl1.1.1.yaml +++ b/.ci_support/linux_ppc64le_grpc_cpp1.46openssl1.1.1.yaml @@ -1,5 +1,3 @@ -abseil_cpp: -- '20211102.0' c_compiler: - gcc c_compiler_version: @@ -18,6 +16,8 @@ docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 grpc_cpp: - '1.46' +libabseil: +- '20220623.0' libcrc32c: - '1.1' libcurl: @@ -29,10 +29,12 @@ openssl: pin_run_as_build: libcurl: max_pin: x + zlib: + max_pin: x.x target_platform: - linux-ppc64le zip_keys: -- - abseil_cpp - - grpc_cpp - - c_compiler_version - cxx_compiler_version +zlib: +- '1.2' diff --git a/.ci_support/linux_ppc64le_abseil_cpp20211102.0grpc_cpp1.46openssl3.yaml b/.ci_support/linux_ppc64le_grpc_cpp1.46openssl3.yaml similarity index 87% rename from .ci_support/linux_ppc64le_abseil_cpp20211102.0grpc_cpp1.46openssl3.yaml rename to .ci_support/linux_ppc64le_grpc_cpp1.46openssl3.yaml index a06eca9..39b8aeb 100644 --- a/.ci_support/linux_ppc64le_abseil_cpp20211102.0grpc_cpp1.46openssl3.yaml +++ b/.ci_support/linux_ppc64le_grpc_cpp1.46openssl3.yaml @@ -1,5 +1,3 @@ -abseil_cpp: -- '20211102.0' c_compiler: - gcc c_compiler_version: @@ -18,6 +16,8 @@ docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 grpc_cpp: - '1.46' +libabseil: +- '20220623.0' libcrc32c: - '1.1' libcurl: @@ -29,10 +29,12 @@ openssl: pin_run_as_build: libcurl: max_pin: x + zlib: + max_pin: x.x target_platform: - linux-ppc64le zip_keys: -- - abseil_cpp - - grpc_cpp - - c_compiler_version - cxx_compiler_version +zlib: +- '1.2' diff --git a/.ci_support/linux_ppc64le_abseil_cpp20210324.2grpc_cpp1.45openssl1.1.1.yaml b/.ci_support/linux_ppc64le_grpc_cpp1.47openssl1.1.1.yaml similarity index 86% rename from .ci_support/linux_ppc64le_abseil_cpp20210324.2grpc_cpp1.45openssl1.1.1.yaml rename to .ci_support/linux_ppc64le_grpc_cpp1.47openssl1.1.1.yaml index bf0c198..58a66d5 100644 --- a/.ci_support/linux_ppc64le_abseil_cpp20210324.2grpc_cpp1.45openssl1.1.1.yaml +++ b/.ci_support/linux_ppc64le_grpc_cpp1.47openssl1.1.1.yaml @@ -1,5 +1,3 @@ -abseil_cpp: -- '20210324.2' c_compiler: - gcc c_compiler_version: @@ -17,7 +15,9 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 grpc_cpp: -- '1.45' +- '1.47' +libabseil: +- '20220623.0' libcrc32c: - '1.1' libcurl: @@ -29,10 +29,12 @@ openssl: pin_run_as_build: libcurl: max_pin: x + zlib: + max_pin: x.x target_platform: - linux-ppc64le zip_keys: -- - abseil_cpp - - grpc_cpp - - c_compiler_version - cxx_compiler_version +zlib: +- '1.2' diff --git a/.ci_support/linux_ppc64le_abseil_cpp20210324.2grpc_cpp1.45openssl3.yaml b/.ci_support/linux_ppc64le_grpc_cpp1.47openssl3.yaml similarity index 85% rename from .ci_support/linux_ppc64le_abseil_cpp20210324.2grpc_cpp1.45openssl3.yaml rename to .ci_support/linux_ppc64le_grpc_cpp1.47openssl3.yaml index 40d1996..7ff7741 100644 --- a/.ci_support/linux_ppc64le_abseil_cpp20210324.2grpc_cpp1.45openssl3.yaml +++ b/.ci_support/linux_ppc64le_grpc_cpp1.47openssl3.yaml @@ -1,5 +1,3 @@ -abseil_cpp: -- '20210324.2' c_compiler: - gcc c_compiler_version: @@ -17,7 +15,9 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 grpc_cpp: -- '1.45' +- '1.47' +libabseil: +- '20220623.0' libcrc32c: - '1.1' libcurl: @@ -29,10 +29,12 @@ openssl: pin_run_as_build: libcurl: max_pin: x + zlib: + max_pin: x.x target_platform: - linux-ppc64le zip_keys: -- - abseil_cpp - - grpc_cpp - - c_compiler_version - cxx_compiler_version +zlib: +- '1.2' diff --git a/.ci_support/migrations/abseil_cpp202206230.yaml b/.ci_support/migrations/abseil_cpp202206230.yaml new file mode 100644 index 0000000..d2d20f0 --- /dev/null +++ b/.ci_support/migrations/abseil_cpp202206230.yaml @@ -0,0 +1,20 @@ +__migrator: + build_number: 1 + kind: version + migration_number: 2 + +# TODO: Make sure to remove the associated zip keys in the final file +# when the migration is complete +abseil_cpp: +- '20220623.0' +# new name, use both for now +libabseil: +- '20220623.0' +# separate output for static builds (depending on C++ version) +# also need to be migrated +libabseil_static: +- '20220623.0' +grpc_cpp: +- '1.46' + +migrator_ts: 1656693919.0942996 diff --git a/.ci_support/migrations/libprotobuf320.yaml b/.ci_support/migrations/libprotobuf320.yaml deleted file mode 100644 index 169106d..0000000 --- a/.ci_support/migrations/libprotobuf320.yaml +++ /dev/null @@ -1,7 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 -libprotobuf: -- '3.20' -migrator_ts: 1648312994.8337886 diff --git a/.ci_support/osx_64_abseil_cpp20211102.0grpc_cpp1.46openssl1.1.1.yaml b/.ci_support/osx_64_grpc_cpp1.46openssl1.1.1.yaml similarity index 85% rename from .ci_support/osx_64_abseil_cpp20211102.0grpc_cpp1.46openssl1.1.1.yaml rename to .ci_support/osx_64_grpc_cpp1.46openssl1.1.1.yaml index 39692c9..61b1831 100644 --- a/.ci_support/osx_64_abseil_cpp20211102.0grpc_cpp1.46openssl1.1.1.yaml +++ b/.ci_support/osx_64_grpc_cpp1.46openssl1.1.1.yaml @@ -1,11 +1,9 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' -abseil_cpp: -- '20211102.0' c_compiler: - clang c_compiler_version: -- '13' +- '14' channel_sources: - conda-forge channel_targets: @@ -13,9 +11,11 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '13' +- '14' grpc_cpp: - '1.46' +libabseil: +- '20220623.0' libcrc32c: - '1.1' libcurl: @@ -29,10 +29,12 @@ openssl: pin_run_as_build: libcurl: max_pin: x + zlib: + max_pin: x.x target_platform: - osx-64 zip_keys: -- - abseil_cpp - - grpc_cpp - - c_compiler_version - cxx_compiler_version +zlib: +- '1.2' diff --git a/.ci_support/osx_64_abseil_cpp20211102.0grpc_cpp1.46openssl3.yaml b/.ci_support/osx_64_grpc_cpp1.46openssl3.yaml similarity index 85% rename from .ci_support/osx_64_abseil_cpp20211102.0grpc_cpp1.46openssl3.yaml rename to .ci_support/osx_64_grpc_cpp1.46openssl3.yaml index b685f5f..b8c9cab 100644 --- a/.ci_support/osx_64_abseil_cpp20211102.0grpc_cpp1.46openssl3.yaml +++ b/.ci_support/osx_64_grpc_cpp1.46openssl3.yaml @@ -1,11 +1,9 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' -abseil_cpp: -- '20211102.0' c_compiler: - clang c_compiler_version: -- '13' +- '14' channel_sources: - conda-forge channel_targets: @@ -13,9 +11,11 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '13' +- '14' grpc_cpp: - '1.46' +libabseil: +- '20220623.0' libcrc32c: - '1.1' libcurl: @@ -29,10 +29,12 @@ openssl: pin_run_as_build: libcurl: max_pin: x + zlib: + max_pin: x.x target_platform: - osx-64 zip_keys: -- - abseil_cpp - - grpc_cpp - - c_compiler_version - cxx_compiler_version +zlib: +- '1.2' diff --git a/.ci_support/osx_64_abseil_cpp20210324.2grpc_cpp1.45openssl1.1.1.yaml b/.ci_support/osx_64_grpc_cpp1.47openssl1.1.1.yaml similarity index 83% rename from .ci_support/osx_64_abseil_cpp20210324.2grpc_cpp1.45openssl1.1.1.yaml rename to .ci_support/osx_64_grpc_cpp1.47openssl1.1.1.yaml index 0f8b612..9b2a5f3 100644 --- a/.ci_support/osx_64_abseil_cpp20210324.2grpc_cpp1.45openssl1.1.1.yaml +++ b/.ci_support/osx_64_grpc_cpp1.47openssl1.1.1.yaml @@ -1,11 +1,9 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' -abseil_cpp: -- '20210324.2' c_compiler: - clang c_compiler_version: -- '13' +- '14' channel_sources: - conda-forge channel_targets: @@ -13,9 +11,11 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '13' +- '14' grpc_cpp: -- '1.45' +- '1.47' +libabseil: +- '20220623.0' libcrc32c: - '1.1' libcurl: @@ -29,10 +29,12 @@ openssl: pin_run_as_build: libcurl: max_pin: x + zlib: + max_pin: x.x target_platform: - osx-64 zip_keys: -- - abseil_cpp - - grpc_cpp - - c_compiler_version - cxx_compiler_version +zlib: +- '1.2' diff --git a/.ci_support/osx_64_abseil_cpp20210324.2grpc_cpp1.45openssl3.yaml b/.ci_support/osx_64_grpc_cpp1.47openssl3.yaml similarity index 83% rename from .ci_support/osx_64_abseil_cpp20210324.2grpc_cpp1.45openssl3.yaml rename to .ci_support/osx_64_grpc_cpp1.47openssl3.yaml index 452aa36..b7b73ec 100644 --- a/.ci_support/osx_64_abseil_cpp20210324.2grpc_cpp1.45openssl3.yaml +++ b/.ci_support/osx_64_grpc_cpp1.47openssl3.yaml @@ -1,11 +1,9 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' -abseil_cpp: -- '20210324.2' c_compiler: - clang c_compiler_version: -- '13' +- '14' channel_sources: - conda-forge channel_targets: @@ -13,9 +11,11 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '13' +- '14' grpc_cpp: -- '1.45' +- '1.47' +libabseil: +- '20220623.0' libcrc32c: - '1.1' libcurl: @@ -29,10 +29,12 @@ openssl: pin_run_as_build: libcurl: max_pin: x + zlib: + max_pin: x.x target_platform: - osx-64 zip_keys: -- - abseil_cpp - - grpc_cpp - - c_compiler_version - cxx_compiler_version +zlib: +- '1.2' diff --git a/.ci_support/osx_arm64_abseil_cpp20211102.0grpc_cpp1.46openssl1.1.1.yaml b/.ci_support/osx_arm64_grpc_cpp1.46openssl1.1.1.yaml similarity index 85% rename from .ci_support/osx_arm64_abseil_cpp20211102.0grpc_cpp1.46openssl1.1.1.yaml rename to .ci_support/osx_arm64_grpc_cpp1.46openssl1.1.1.yaml index 1b8b8b4..64d4fd7 100644 --- a/.ci_support/osx_arm64_abseil_cpp20211102.0grpc_cpp1.46openssl1.1.1.yaml +++ b/.ci_support/osx_arm64_grpc_cpp1.46openssl1.1.1.yaml @@ -1,11 +1,9 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' -abseil_cpp: -- '20211102.0' c_compiler: - clang c_compiler_version: -- '13' +- '14' channel_sources: - conda-forge channel_targets: @@ -13,9 +11,11 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '13' +- '14' grpc_cpp: - '1.46' +libabseil: +- '20220623.0' libcrc32c: - '1.1' libcurl: @@ -29,10 +29,12 @@ openssl: pin_run_as_build: libcurl: max_pin: x + zlib: + max_pin: x.x target_platform: - osx-arm64 zip_keys: -- - abseil_cpp - - grpc_cpp - - c_compiler_version - cxx_compiler_version +zlib: +- '1.2' diff --git a/.ci_support/osx_arm64_abseil_cpp20211102.0grpc_cpp1.46openssl3.yaml b/.ci_support/osx_arm64_grpc_cpp1.46openssl3.yaml similarity index 85% rename from .ci_support/osx_arm64_abseil_cpp20211102.0grpc_cpp1.46openssl3.yaml rename to .ci_support/osx_arm64_grpc_cpp1.46openssl3.yaml index 2dd75dc..9d720b2 100644 --- a/.ci_support/osx_arm64_abseil_cpp20211102.0grpc_cpp1.46openssl3.yaml +++ b/.ci_support/osx_arm64_grpc_cpp1.46openssl3.yaml @@ -1,11 +1,9 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' -abseil_cpp: -- '20211102.0' c_compiler: - clang c_compiler_version: -- '13' +- '14' channel_sources: - conda-forge channel_targets: @@ -13,9 +11,11 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '13' +- '14' grpc_cpp: - '1.46' +libabseil: +- '20220623.0' libcrc32c: - '1.1' libcurl: @@ -29,10 +29,12 @@ openssl: pin_run_as_build: libcurl: max_pin: x + zlib: + max_pin: x.x target_platform: - osx-arm64 zip_keys: -- - abseil_cpp - - grpc_cpp - - c_compiler_version - cxx_compiler_version +zlib: +- '1.2' diff --git a/.ci_support/osx_arm64_abseil_cpp20210324.2grpc_cpp1.45openssl1.1.1.yaml b/.ci_support/osx_arm64_grpc_cpp1.47openssl1.1.1.yaml similarity index 83% rename from .ci_support/osx_arm64_abseil_cpp20210324.2grpc_cpp1.45openssl1.1.1.yaml rename to .ci_support/osx_arm64_grpc_cpp1.47openssl1.1.1.yaml index 9609335..3f64a91 100644 --- a/.ci_support/osx_arm64_abseil_cpp20210324.2grpc_cpp1.45openssl1.1.1.yaml +++ b/.ci_support/osx_arm64_grpc_cpp1.47openssl1.1.1.yaml @@ -1,11 +1,9 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' -abseil_cpp: -- '20210324.2' c_compiler: - clang c_compiler_version: -- '13' +- '14' channel_sources: - conda-forge channel_targets: @@ -13,9 +11,11 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '13' +- '14' grpc_cpp: -- '1.45' +- '1.47' +libabseil: +- '20220623.0' libcrc32c: - '1.1' libcurl: @@ -29,10 +29,12 @@ openssl: pin_run_as_build: libcurl: max_pin: x + zlib: + max_pin: x.x target_platform: - osx-arm64 zip_keys: -- - abseil_cpp - - grpc_cpp - - c_compiler_version - cxx_compiler_version +zlib: +- '1.2' diff --git a/.ci_support/osx_arm64_abseil_cpp20210324.2grpc_cpp1.45openssl3.yaml b/.ci_support/osx_arm64_grpc_cpp1.47openssl3.yaml similarity index 83% rename from .ci_support/osx_arm64_abseil_cpp20210324.2grpc_cpp1.45openssl3.yaml rename to .ci_support/osx_arm64_grpc_cpp1.47openssl3.yaml index 6884a1f..68996d0 100644 --- a/.ci_support/osx_arm64_abseil_cpp20210324.2grpc_cpp1.45openssl3.yaml +++ b/.ci_support/osx_arm64_grpc_cpp1.47openssl3.yaml @@ -1,11 +1,9 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' -abseil_cpp: -- '20210324.2' c_compiler: - clang c_compiler_version: -- '13' +- '14' channel_sources: - conda-forge channel_targets: @@ -13,9 +11,11 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '13' +- '14' grpc_cpp: -- '1.45' +- '1.47' +libabseil: +- '20220623.0' libcrc32c: - '1.1' libcurl: @@ -29,10 +29,12 @@ openssl: pin_run_as_build: libcurl: max_pin: x + zlib: + max_pin: x.x target_platform: - osx-arm64 zip_keys: -- - abseil_cpp - - grpc_cpp - - c_compiler_version - cxx_compiler_version +zlib: +- '1.2' diff --git a/.ci_support/win_64_abseil_cpp20211102.0grpc_cpp1.46openssl1.1.1.yaml b/.ci_support/win_64_grpc_cpp1.46openssl1.1.1.yaml similarity index 75% rename from .ci_support/win_64_abseil_cpp20211102.0grpc_cpp1.46openssl1.1.1.yaml rename to .ci_support/win_64_grpc_cpp1.46openssl1.1.1.yaml index 7e9923c..11284d8 100644 --- a/.ci_support/win_64_abseil_cpp20211102.0grpc_cpp1.46openssl1.1.1.yaml +++ b/.ci_support/win_64_grpc_cpp1.46openssl1.1.1.yaml @@ -1,15 +1,15 @@ -abseil_cpp: -- '20211102.0' c_compiler: -- vs2017 +- vs2019 channel_sources: - conda-forge channel_targets: - conda-forge main cxx_compiler: -- vs2017 +- vs2019 grpc_cpp: - '1.46' +libabseil: +- '20220623.0' libcrc32c: - '1.1' libcurl: @@ -21,8 +21,9 @@ openssl: pin_run_as_build: libcurl: max_pin: x + zlib: + max_pin: x.x target_platform: - win-64 -zip_keys: -- - abseil_cpp - - grpc_cpp +zlib: +- '1.2' diff --git a/.ci_support/win_64_abseil_cpp20211102.0grpc_cpp1.46openssl3.yaml b/.ci_support/win_64_grpc_cpp1.46openssl3.yaml similarity index 75% rename from .ci_support/win_64_abseil_cpp20211102.0grpc_cpp1.46openssl3.yaml rename to .ci_support/win_64_grpc_cpp1.46openssl3.yaml index cab599b..9059b0f 100644 --- a/.ci_support/win_64_abseil_cpp20211102.0grpc_cpp1.46openssl3.yaml +++ b/.ci_support/win_64_grpc_cpp1.46openssl3.yaml @@ -1,15 +1,15 @@ -abseil_cpp: -- '20211102.0' c_compiler: -- vs2017 +- vs2019 channel_sources: - conda-forge channel_targets: - conda-forge main cxx_compiler: -- vs2017 +- vs2019 grpc_cpp: - '1.46' +libabseil: +- '20220623.0' libcrc32c: - '1.1' libcurl: @@ -21,8 +21,9 @@ openssl: pin_run_as_build: libcurl: max_pin: x + zlib: + max_pin: x.x target_platform: - win-64 -zip_keys: -- - abseil_cpp - - grpc_cpp +zlib: +- '1.2' diff --git a/.ci_support/win_64_abseil_cpp20210324.2grpc_cpp1.45openssl1.1.1.yaml b/.ci_support/win_64_grpc_cpp1.47openssl1.1.1.yaml similarity index 72% rename from .ci_support/win_64_abseil_cpp20210324.2grpc_cpp1.45openssl1.1.1.yaml rename to .ci_support/win_64_grpc_cpp1.47openssl1.1.1.yaml index 7372c59..2bc0459 100644 --- a/.ci_support/win_64_abseil_cpp20210324.2grpc_cpp1.45openssl1.1.1.yaml +++ b/.ci_support/win_64_grpc_cpp1.47openssl1.1.1.yaml @@ -1,15 +1,15 @@ -abseil_cpp: -- '20210324.2' c_compiler: -- vs2017 +- vs2019 channel_sources: - conda-forge channel_targets: - conda-forge main cxx_compiler: -- vs2017 +- vs2019 grpc_cpp: -- '1.45' +- '1.47' +libabseil: +- '20220623.0' libcrc32c: - '1.1' libcurl: @@ -21,8 +21,9 @@ openssl: pin_run_as_build: libcurl: max_pin: x + zlib: + max_pin: x.x target_platform: - win-64 -zip_keys: -- - abseil_cpp - - grpc_cpp +zlib: +- '1.2' diff --git a/.ci_support/win_64_abseil_cpp20210324.2grpc_cpp1.45openssl3.yaml b/.ci_support/win_64_grpc_cpp1.47openssl3.yaml similarity index 72% rename from .ci_support/win_64_abseil_cpp20210324.2grpc_cpp1.45openssl3.yaml rename to .ci_support/win_64_grpc_cpp1.47openssl3.yaml index 6e0eed2..a15c5aa 100644 --- a/.ci_support/win_64_abseil_cpp20210324.2grpc_cpp1.45openssl3.yaml +++ b/.ci_support/win_64_grpc_cpp1.47openssl3.yaml @@ -1,15 +1,15 @@ -abseil_cpp: -- '20210324.2' c_compiler: -- vs2017 +- vs2019 channel_sources: - conda-forge channel_targets: - conda-forge main cxx_compiler: -- vs2017 +- vs2019 grpc_cpp: -- '1.45' +- '1.47' +libabseil: +- '20220623.0' libcrc32c: - '1.1' libcurl: @@ -21,8 +21,9 @@ openssl: pin_run_as_build: libcurl: max_pin: x + zlib: + max_pin: x.x target_platform: - win-64 -zip_keys: -- - abseil_cpp - - grpc_cpp +zlib: +- '1.2' diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 50dc92d..df47542 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1 @@ -* @coryan @davidbrochart @xhochy \ No newline at end of file +* @coryan @davidbrochart @h-vetinari @xhochy \ No newline at end of file diff --git a/README.md b/README.md index 1cbbb7c..c4cbc7f 100644 --- a/README.md +++ b/README.md @@ -27,171 +27,171 @@ Current build status - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -326,5 +326,6 @@ Feedstock Maintainers * [@coryan](https://github.com/coryan/) * [@davidbrochart](https://github.com/davidbrochart/) +* [@h-vetinari](https://github.com/h-vetinari/) * [@xhochy](https://github.com/xhochy/) diff --git a/recipe/0001-fix-storage-dep-windows.patch b/recipe/0001-fix-storage-dep-windows.patch deleted file mode 100644 index 6471c4e..0000000 --- a/recipe/0001-fix-storage-dep-windows.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/google/cloud/storage/CMakeLists.txt b/google/cloud/storage/CMakeLists.txt -index 876d8c6fc..bc15beb6c 100644 ---- a/google/cloud/storage/CMakeLists.txt -+++ b/google/cloud/storage/CMakeLists.txt -@@ -267,6 +267,11 @@ target_link_libraries( - OpenSSL::SSL - OpenSSL::Crypto - ZLIB::ZLIB) -+if (WIN32) -+ # We use `setsockopt()` directly, which requires the ws2_32 (Winsock2 for -+ # Windows32?) library on Windows. -+ target_link_libraries(google_cloud_cpp_storage PUBLIC ws2_32) -+endif () - google_cloud_cpp_add_common_options(google_cloud_cpp_storage) - target_include_directories( - google_cloud_cpp_storage PUBLIC $ diff --git a/recipe/bld.bat b/recipe/bld.bat index 8591db8..d3ec995 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -1,6 +1,9 @@ @echo on setlocal EnableDelayedExpansion +mkdir build +cd build + @REM CMake does not like paths with \ characters set LIBRARY_PREFIX="%LIBRARY_PREFIX:\=/%" set BUILD_PREFIX="%BUILD_PREFIX:\=/%" @@ -8,16 +11,16 @@ set SRC_DIR="%SRC_DIR:\=/%" cmake -G "Ninja" ^ -DBUILD_TESTING=OFF ^ - -DGOOGLE_CLOUD_CPP_ENABLE_EXAMPLES=OFF ^ -DBUILD_SHARED_LIBS=OFF ^ -DCMAKE_BUILD_TYPE=Release ^ + -DCMAKE_CXX_STANDARD=17 ^ -DCMAKE_INSTALL_PREFIX="%LIBRARY_PREFIX%" ^ -DCMAKE_MODULE_PATH="%LIBRARY_PREFIX%/lib/cmake" ^ -DCMAKE_INSTALL_LIBDIR=lib ^ + -DGOOGLE_CLOUD_CPP_ENABLE_EXAMPLES=OFF ^ -DGOOGLE_CLOUD_CPP_ENABLE_WERROR=OFF ^ - -DProtobuf_PROTOC_EXECUTABLE="%BUILD_PREFIX%/bin/protoc" ^ - -S "%SRC_DIR%" -B "%SRC_DIR%/build_cmake" -if NOT ERRORLEVEL 0 exit /b 1 + .. +if %ERRORLEVEL% neq 0 exit 1 -cmake --build "%SRC_DIR%/build_cmake" --config Release -if NOT ERRORLEVEL 0 exit /b 1 +cmake --build . --config Release +if %ERRORLEVEL% neq 0 exit 1 diff --git a/recipe/build-libgoogle-cloud.bat b/recipe/build-libgoogle-cloud.bat index fbbc16e..6eceaf4 100644 --- a/recipe/build-libgoogle-cloud.bat +++ b/recipe/build-libgoogle-cloud.bat @@ -8,9 +8,9 @@ set SRC_DIR="%SRC_DIR:\=/%" if [%PKG_NAME%] == [libgoogle-cloud] ( @rem cmake --install build_cmake --component google_cloud_cpp_runtime - if NOT ERRORLEVEL 0 exit /b 1 + if %ERRORLEVEL% neq 0 exit 1 ) else ( @rem cmake --install build_cmake --component google_cloud_cpp_development - cmake --install build_cmake - if NOT ERRORLEVEL 0 exit /b 1 + cmake --install build + if %ERRORLEVEL% neq 0 exit 1 ) diff --git a/recipe/build.sh b/recipe/build.sh index 8003dac..1231789 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -6,15 +6,9 @@ mkdir build_cmake pushd build_cmake export OPENSSL_ROOT_DIR=$PREFIX -if [[ "${target_platform}" == osx* ]] && [[ "${abseil_cpp}" == "20210324.2" ]]; then - export CMAKE_ARGS="${CMAKE_ARGS} -DCMAKE_CXX_STANDARD=14" -else - export CMAKE_ARGS="${CMAKE_ARGS} -DCMAKE_CXX_STANDARD=17" -fi # Overwrite location of protoc plugin to support cross-compilation sed -ie "s;protoc-gen-grpc.*$;protoc-gen-grpc=${BUILD_PREFIX}/bin/grpc_cpp_plugin;g" ../cmake/CompileProtos.cmake -sed -ie "s;^set(CMAKE_CXX_STANDARD 11);;" ../CMakeLists.txt cmake ${CMAKE_ARGS} \ -GNinja \ @@ -22,6 +16,7 @@ cmake ${CMAKE_ARGS} \ -DBUILD_SHARED_LIBS=ON \ -DOPENSSL_ROOT_DIR=$PREFIX \ -DCMAKE_BUILD_TYPE=release \ + -DCMAKE_CXX_STANDARD=17 \ -DCMAKE_INSTALL_PREFIX=$PREFIX \ -DCMAKE_INSTALL_LIBDIR=lib \ -DProtobuf_PROTOC_EXECUTABLE=$BUILD_PREFIX/bin/protoc \ diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml new file mode 100644 index 0000000..d360d72 --- /dev/null +++ b/recipe/conda_build_config.yaml @@ -0,0 +1,5 @@ +# transition period; remove after migrations for +# abseil/grpc/protobuf have progressed/completed +grpc_cpp: + - "1.46" + - "1.47" diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 67ff94a..c32a7a8 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -10,7 +10,7 @@ source: sha256: 168c38219feb5a2c6b81bec5960cd067f6cda3daa83cd9761fa04f27d2b78f17 build: - number: 0 + number: 1 requirements: build: - {{ compiler('c') }} @@ -20,13 +20,14 @@ requirements: - grpc-cpp - libprotobuf host: - - abseil-cpp + - libabseil - libcrc32c - grpc-cpp - libcurl - libprotobuf - openssl - nlohmann_json + - zlib outputs: - name: libgoogle-cloud @@ -44,7 +45,7 @@ outputs: - grpc-cpp - libprotobuf host: - - abseil-cpp + - libabseil - libcrc32c - grpc-cpp - libcurl @@ -88,7 +89,7 @@ outputs: - libprotobuf host: - {{ pin_subpackage("libgoogle-cloud", exact=True) }} - - abseil-cpp + - libabseil - libcrc32c - grpc-cpp - libcurl @@ -98,6 +99,9 @@ outputs: run: - {{ pin_subpackage("libgoogle-cloud", exact=True) }} - nlohmann_json + # cannot load package without zlib because it's specified + # as required; if possible, this should be removed upstream + - zlib test: commands: - ./run_test_google_cloud_cpp.sh # [not win] @@ -134,3 +138,4 @@ extra: - coryan - davidbrochart - xhochy + - h-vetinari diff --git a/recipe/run_test_google_cloud_cpp.bat b/recipe/run_test_google_cloud_cpp.bat index 287dd2e..970eb9b 100644 --- a/recipe/run_test_google_cloud_cpp.bat +++ b/recipe/run_test_google_cloud_cpp.bat @@ -10,7 +10,7 @@ cmake -GNinja ^ -DCMAKE_BUILD_TYPE=Release ^ -DCMAKE_PREFIX_PATH="%LIBRARY_PREFIX%" ^ -DCMAKE_MODULE_PATH="%LIBRARY_PREFIX%/lib/cmake" -if NOT ERRORLEVEL 0 exit /b 1 +if %ERRORLEVEL% neq 0 exit 1 cmake --build .build/quickstart --config Release -if NOT ERRORLEVEL 0 exit /b 1 +if %ERRORLEVEL% neq 0 exit 1
VariantStatus
linux_64_abseil_cpp20210324.2grpc_cpp1.45openssl1.1.1linux_64_grpc_cpp1.46openssl1.1.1 - variant + variant
linux_64_abseil_cpp20210324.2grpc_cpp1.45openssl3linux_64_grpc_cpp1.46openssl3 - variant + variant
linux_64_abseil_cpp20211102.0grpc_cpp1.46openssl1.1.1linux_64_grpc_cpp1.47openssl1.1.1 - variant + variant
linux_64_abseil_cpp20211102.0grpc_cpp1.46openssl3linux_64_grpc_cpp1.47openssl3 - variant + variant
linux_aarch64_abseil_cpp20210324.2grpc_cpp1.45openssl1.1.1linux_aarch64_grpc_cpp1.46openssl1.1.1 - variant + variant
linux_aarch64_abseil_cpp20210324.2grpc_cpp1.45openssl3linux_aarch64_grpc_cpp1.46openssl3 - variant + variant
linux_aarch64_abseil_cpp20211102.0grpc_cpp1.46openssl1.1.1linux_aarch64_grpc_cpp1.47openssl1.1.1 - variant + variant
linux_aarch64_abseil_cpp20211102.0grpc_cpp1.46openssl3linux_aarch64_grpc_cpp1.47openssl3 - variant + variant
linux_ppc64le_abseil_cpp20210324.2grpc_cpp1.45openssl1.1.1linux_ppc64le_grpc_cpp1.46openssl1.1.1 - variant + variant
linux_ppc64le_abseil_cpp20210324.2grpc_cpp1.45openssl3linux_ppc64le_grpc_cpp1.46openssl3 - variant + variant
linux_ppc64le_abseil_cpp20211102.0grpc_cpp1.46openssl1.1.1linux_ppc64le_grpc_cpp1.47openssl1.1.1 - variant + variant
linux_ppc64le_abseil_cpp20211102.0grpc_cpp1.46openssl3linux_ppc64le_grpc_cpp1.47openssl3 - variant + variant
osx_64_abseil_cpp20210324.2grpc_cpp1.45openssl1.1.1osx_64_grpc_cpp1.46openssl1.1.1 - variant + variant
osx_64_abseil_cpp20210324.2grpc_cpp1.45openssl3osx_64_grpc_cpp1.46openssl3 - variant + variant
osx_64_abseil_cpp20211102.0grpc_cpp1.46openssl1.1.1osx_64_grpc_cpp1.47openssl1.1.1 - variant + variant
osx_64_abseil_cpp20211102.0grpc_cpp1.46openssl3osx_64_grpc_cpp1.47openssl3 - variant + variant
osx_arm64_abseil_cpp20210324.2grpc_cpp1.45openssl1.1.1osx_arm64_grpc_cpp1.46openssl1.1.1 - variant + variant
osx_arm64_abseil_cpp20210324.2grpc_cpp1.45openssl3osx_arm64_grpc_cpp1.46openssl3 - variant + variant
osx_arm64_abseil_cpp20211102.0grpc_cpp1.46openssl1.1.1osx_arm64_grpc_cpp1.47openssl1.1.1 - variant + variant
osx_arm64_abseil_cpp20211102.0grpc_cpp1.46openssl3osx_arm64_grpc_cpp1.47openssl3 - variant + variant
win_64_abseil_cpp20210324.2grpc_cpp1.45openssl1.1.1win_64_grpc_cpp1.46openssl1.1.1 - variant + variant
win_64_abseil_cpp20210324.2grpc_cpp1.45openssl3win_64_grpc_cpp1.46openssl3 - variant + variant
win_64_abseil_cpp20211102.0grpc_cpp1.46openssl1.1.1win_64_grpc_cpp1.47openssl1.1.1 - variant + variant
win_64_abseil_cpp20211102.0grpc_cpp1.46openssl3win_64_grpc_cpp1.47openssl3 - variant + variant