Merge pull request #68 from regro-cf-autotick-bot/2023-06-02_h5c5cd3

re2 v2023-06-02
conda-forge · Oct 11, 2023 · 4a93f51 · 4a93f51
2 parents 02137f2 + 4f2dfb9
commit 4a93f51
Show file tree

Hide file tree

Showing 19 changed files with 348 additions and 165 deletions.
diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml
diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml
diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml
@@ -1,7 +1,7 @@
 c_compiler:
 - gcc
 c_compiler_version:
-- '11'
+- '12'
 cdt_name:
 - cos6
 channel_sources:
@@ -11,11 +11,13 @@ channel_targets:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '11'
+- '12'
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 libabseil:
-- '20220623.0'
+- '20230802'
+re2:
+- 2023.03.02
 target_platform:
 - linux-64
 zip_keys:

diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml
@@ -3,7 +3,7 @@ BUILD:
 c_compiler:
 - gcc
 c_compiler_version:
-- '11'
+- '12'
 cdt_arch:
 - aarch64
 cdt_name:
@@ -15,11 +15,13 @@ channel_targets:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '11'
+- '12'
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 libabseil:
-- '20220623.0'
+- '20230802'
+re2:
+- 2023.03.02
 target_platform:
 - linux-aarch64
 zip_keys:

diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml
@@ -1,7 +1,7 @@
 c_compiler:
 - gcc
 c_compiler_version:
-- '11'
+- '12'
 cdt_name:
 - cos7
 channel_sources:
@@ -11,11 +11,13 @@ channel_targets:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '11'
+- '12'
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 libabseil:
-- '20220623.0'
+- '20230802'
+re2:
+- 2023.03.02
 target_platform:
 - linux-ppc64le
 zip_keys:

diff --git a/.ci_support/migrations/libabseil20230802_libgrpc157_libprotobuf4234.yaml b/.ci_support/migrations/libabseil20230802_libgrpc157_libprotobuf4234.yaml
@@ -0,0 +1,10 @@
+__migrator:
+  build_number: 1
+  kind: version
+  migration_number: 1
+# need to keep this in the migrator until we're ready
+# to bump the deployment target conda-forge-wide, see
+# https://github.com/conda-forge/conda-forge.github.io/issues/1844#issuecomment-1734933359
+MACOSX_DEPLOYMENT_TARGET:  # [osx and x86_64]
+- "10.13"                  # [osx and x86_64]
+migrator_ts: 1692632590.658328
diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml
@@ -1,21 +1,23 @@
 MACOSX_DEPLOYMENT_TARGET:
-- '10.9'
+- '10.13'
 c_compiler:
 - clang
 c_compiler_version:
-- '14'
+- '16'
 channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '14'
+- '16'
 libabseil:
-- '20220623.0'
+- '20230802'
 macos_machine:
 - x86_64-apple-darwin13.4.0
+re2:
+- 2023.03.02
 target_platform:
 - osx-64
 zip_keys:

diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml
@@ -3,19 +3,21 @@ MACOSX_DEPLOYMENT_TARGET:
 c_compiler:
 - clang
 c_compiler_version:
-- '14'
+- '16'
 channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '14'
+- '16'
 libabseil:
-- '20220623.0'
+- '20230802'
 macos_machine:
 - arm64-apple-darwin20.0.0
+re2:
+- 2023.03.02
 target_platform:
 - osx-arm64
 zip_keys:

diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml
@@ -7,6 +7,8 @@ channel_targets:
 cxx_compiler:
 - vs2019
 libabseil:
-- '20220623.0'
+- '20230802'
+re2:
+- 2023.03.02
 target_platform:
 - win-64
diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
diff --git a/.scripts/logging_utils.sh b/.scripts/logging_utils.sh
diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh