From 526055b2373825dd363a7fb4380530b331772f40 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 22 Mar 2024 08:38:42 +0000 Subject: [PATCH 1/2] Rebuild for aws_crt_cpp 0.26.4 --- .ci_support/migrations/aws_crt_cpp0264.yaml | 9 +++++++++ recipe/meta.yaml | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 .ci_support/migrations/aws_crt_cpp0264.yaml diff --git a/.ci_support/migrations/aws_crt_cpp0264.yaml b/.ci_support/migrations/aws_crt_cpp0264.yaml new file mode 100644 index 0000000..83b583d --- /dev/null +++ b/.ci_support/migrations/aws_crt_cpp0264.yaml @@ -0,0 +1,9 @@ +__migrator: + build_number: 1 + commit_message: Rebuild for aws_crt_cpp 0.26.4 + kind: version + migration_number: 1 + automerge: true +aws_crt_cpp: +- 0.26.4 +migrator_ts: 1710797505.2614887 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 7c2caca..b8b37c0 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -9,7 +9,7 @@ source: sha256: 89b7b2fc921e4c5a35785f3bcf0f7dbf76ad488d85c9888043ed7b8e5029f25d build: - number: 3 + number: 4 run_exports: - {{ pin_subpackage("aws-sdk-cpp", max_pin="x.x.x") }} From 11dd9966f8a3a1eb44423203279e8f924b71a884 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 22 Mar 2024 08:38:54 +0000 Subject: [PATCH 2/2] MNT: Re-rendered with conda-build 24.1.2, conda-smithy 3.33.0, and conda-forge-pinning 2024.03.21.15.27.47 --- .azure-pipelines/azure-pipelines-linux.yml | 1 + .azure-pipelines/azure-pipelines-osx.yml | 1 + .ci_support/linux_64_.yaml | 2 +- .ci_support/linux_aarch64_.yaml | 2 +- .ci_support/linux_ppc64le_.yaml | 2 +- .ci_support/migrations/aws_c_common0914.yaml | 9 --------- .ci_support/migrations/aws_crt_cpp0263.yaml | 9 --------- .ci_support/osx_64_.yaml | 2 +- .ci_support/osx_arm64_.yaml | 2 +- .ci_support/win_64_.yaml | 2 +- .scripts/build_steps.sh | 2 +- .scripts/run_osx_build.sh | 2 +- .scripts/run_win_build.bat | 2 +- azure-pipelines.yml | 4 ++-- 14 files changed, 13 insertions(+), 29 deletions(-) delete mode 100644 .ci_support/migrations/aws_c_common0914.yaml delete mode 100644 .ci_support/migrations/aws_crt_cpp0263.yaml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 2b93a12..aef462c 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -21,6 +21,7 @@ jobs: UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 + variables: {} steps: # configure qemu binfmt-misc running. This allows us to run docker containers diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index f3ff063..730a626 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -15,6 +15,7 @@ jobs: CONFIG: osx_arm64_ UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 + variables: {} steps: # TODO: Fast finish on azure pipelines? diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index 4718a4b..b86a473 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -5,7 +5,7 @@ aws_c_event_stream: aws_checksums: - 0.1.18 aws_crt_cpp: -- 0.26.3 +- 0.26.4 c_compiler: - gcc c_compiler_version: diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index 4e0bff4..75f3f97 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -7,7 +7,7 @@ aws_c_event_stream: aws_checksums: - 0.1.18 aws_crt_cpp: -- 0.26.3 +- 0.26.4 c_compiler: - gcc c_compiler_version: diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index 9fccd54..4823f57 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -5,7 +5,7 @@ aws_c_event_stream: aws_checksums: - 0.1.18 aws_crt_cpp: -- 0.26.3 +- 0.26.4 c_compiler: - gcc c_compiler_version: diff --git a/.ci_support/migrations/aws_c_common0914.yaml b/.ci_support/migrations/aws_c_common0914.yaml deleted file mode 100644 index 7e67dc9..0000000 --- a/.ci_support/migrations/aws_c_common0914.yaml +++ /dev/null @@ -1,9 +0,0 @@ -__migrator: - build_number: 1 - commit_message: Rebuild for aws_c_common 0.9.14 - kind: version - migration_number: 1 - automerge: true -aws_c_common: -- 0.9.14 -migrator_ts: 1709681135.2469783 diff --git a/.ci_support/migrations/aws_crt_cpp0263.yaml b/.ci_support/migrations/aws_crt_cpp0263.yaml deleted file mode 100644 index a5ff59d..0000000 --- a/.ci_support/migrations/aws_crt_cpp0263.yaml +++ /dev/null @@ -1,9 +0,0 @@ -__migrator: - build_number: 1 - commit_message: Rebuild for aws_crt_cpp 0.26.3 - kind: version - migration_number: 1 - automerge: true -aws_crt_cpp: -- 0.26.3 -migrator_ts: 1710268738.0905566 diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 0557d69..9a9ecf2 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -9,7 +9,7 @@ aws_c_event_stream: aws_checksums: - 0.1.18 aws_crt_cpp: -- 0.26.3 +- 0.26.4 c_compiler: - clang c_compiler_version: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index ef20ed7..23ecd81 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -7,7 +7,7 @@ aws_c_event_stream: aws_checksums: - 0.1.18 aws_crt_cpp: -- 0.26.3 +- 0.26.4 c_compiler: - clang c_compiler_version: diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml index 908038c..9cb50a1 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -5,7 +5,7 @@ aws_c_event_stream: aws_checksums: - 0.1.18 aws_crt_cpp: -- 0.26.3 +- 0.26.4 c_compiler: - vs2019 channel_sources: diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 9121002..899ba03 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -68,7 +68,7 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then # Drop into an interactive shell /bin/bash else - conda build "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ + conda-build "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \ --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 16daa69..07dff21 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -81,7 +81,7 @@ else EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" fi - conda build ./recipe -m ./.ci_support/${CONFIG}.yaml \ + conda-build ./recipe -m ./.ci_support/${CONFIG}.yaml \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file ./.ci_support/clobber_${CONFIG}.yaml \ --extra-meta flow_run_id="$flow_run_id" remote_url="$remote_url" sha="$sha" diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index f801cf4..6d54697 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -55,7 +55,7 @@ call :end_group :: Build the recipe echo Building recipe -conda.exe build "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% +conda-build.exe "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% if !errorlevel! neq 0 exit /b !errorlevel! :: Prepare some environment variables for the upload step diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 6b346f5..e5306da 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -4,5 +4,5 @@ jobs: - template: ./.azure-pipelines/azure-pipelines-linux.yml - - template: ./.azure-pipelines/azure-pipelines-win.yml - - template: ./.azure-pipelines/azure-pipelines-osx.yml \ No newline at end of file + - template: ./.azure-pipelines/azure-pipelines-osx.yml + - template: ./.azure-pipelines/azure-pipelines-win.yml \ No newline at end of file