From 84c7b33c917d5483b0b9b86d9d08f2488b3cc675 Mon Sep 17 00:00:00 2001 From: John Blischak Date: Wed, 6 Dec 2023 13:51:22 -0500 Subject: [PATCH 1/2] MNT: Re-rendered with conda-build 3.28.0, conda-smithy 3.30.1, and conda-forge-pinning 2023.12.05.22.51.14 --- .azure-pipelines/azure-pipelines-linux.yml | 8 +++--- .azure-pipelines/azure-pipelines-osx.yml | 3 +++ .../osx_64_libcurl7libdeflate1.12.yaml | 2 +- .../osx_64_libcurl7libdeflate1.13.yaml | 2 +- .../osx_64_libcurl7libdeflate1.14.yaml | 2 +- .../osx_64_libcurl7libdeflate1.16.yaml | 2 +- .../osx_64_libcurl7libdeflate1.17.yaml | 2 +- .../osx_64_libcurl8libdeflate1.12.yaml | 2 +- .../osx_64_libcurl8libdeflate1.13.yaml | 2 +- .../osx_64_libcurl8libdeflate1.14.yaml | 2 +- .../osx_64_libcurl8libdeflate1.16.yaml | 2 +- .../osx_64_libcurl8libdeflate1.17.yaml | 2 +- .../osx_arm64_libcurl7libdeflate1.12.yaml | 2 +- .../osx_arm64_libcurl7libdeflate1.13.yaml | 2 +- .../osx_arm64_libcurl7libdeflate1.14.yaml | 2 +- .../osx_arm64_libcurl7libdeflate1.16.yaml | 2 +- .../osx_arm64_libcurl7libdeflate1.17.yaml | 2 +- .../osx_arm64_libcurl8libdeflate1.12.yaml | 2 +- .../osx_arm64_libcurl8libdeflate1.13.yaml | 2 +- .../osx_arm64_libcurl8libdeflate1.14.yaml | 2 +- .../osx_arm64_libcurl8libdeflate1.16.yaml | 2 +- .../osx_arm64_libcurl8libdeflate1.17.yaml | 2 +- .scripts/build_steps.sh | 20 +++++++++----- .scripts/logging_utils.sh | 4 +-- .scripts/run_docker_build.sh | 3 +++ .scripts/run_osx_build.sh | 27 ++++++++++++------- 26 files changed, 62 insertions(+), 43 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 3034b1e..23f55a8 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -71,11 +71,6 @@ jobs: timeoutInMinutes: 360 steps: - - script: | - rm -rf /opt/ghc - df -h - displayName: Manage disk space - # configure qemu binfmt-misc running. This allows us to run docker containers # embedded qemu-static - script: | @@ -86,6 +81,9 @@ jobs: - script: | export CI=azure + export flow_run_id=azure_$(Build.BuildNumber).$(System.JobAttempt) + export remote_url=$(Build.Repository.Uri) + export sha=$(Build.SourceVersion) export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) if [[ "${BUILD_REASON:-}" == "PullRequest" ]]; then diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 554000f..fc0e382 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -74,6 +74,9 @@ jobs: # TODO: Fast finish on azure pipelines? - script: | export CI=azure + export flow_run_id=azure_$(Build.BuildNumber).$(System.JobAttempt) + export remote_url=$(Build.Repository.Uri) + export sha=$(Build.SourceVersion) export OSX_FORCE_SDK_DOWNLOAD="1" export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) diff --git a/.ci_support/osx_64_libcurl7libdeflate1.12.yaml b/.ci_support/osx_64_libcurl7libdeflate1.12.yaml index 2488125..6d4053c 100644 --- a/.ci_support/osx_64_libcurl7libdeflate1.12.yaml +++ b/.ci_support/osx_64_libcurl7libdeflate1.12.yaml @@ -7,7 +7,7 @@ bzip2: c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_64_libcurl7libdeflate1.13.yaml b/.ci_support/osx_64_libcurl7libdeflate1.13.yaml index 87a2301..c501a05 100644 --- a/.ci_support/osx_64_libcurl7libdeflate1.13.yaml +++ b/.ci_support/osx_64_libcurl7libdeflate1.13.yaml @@ -7,7 +7,7 @@ bzip2: c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_64_libcurl7libdeflate1.14.yaml b/.ci_support/osx_64_libcurl7libdeflate1.14.yaml index 019ade0..870541f 100644 --- a/.ci_support/osx_64_libcurl7libdeflate1.14.yaml +++ b/.ci_support/osx_64_libcurl7libdeflate1.14.yaml @@ -7,7 +7,7 @@ bzip2: c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_64_libcurl7libdeflate1.16.yaml b/.ci_support/osx_64_libcurl7libdeflate1.16.yaml index 2cf1cb5..6ad8487 100644 --- a/.ci_support/osx_64_libcurl7libdeflate1.16.yaml +++ b/.ci_support/osx_64_libcurl7libdeflate1.16.yaml @@ -7,7 +7,7 @@ bzip2: c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_64_libcurl7libdeflate1.17.yaml b/.ci_support/osx_64_libcurl7libdeflate1.17.yaml index 6d4be35..1baa0f9 100644 --- a/.ci_support/osx_64_libcurl7libdeflate1.17.yaml +++ b/.ci_support/osx_64_libcurl7libdeflate1.17.yaml @@ -7,7 +7,7 @@ bzip2: c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_64_libcurl8libdeflate1.12.yaml b/.ci_support/osx_64_libcurl8libdeflate1.12.yaml index 1424bf1..4fee4dc 100644 --- a/.ci_support/osx_64_libcurl8libdeflate1.12.yaml +++ b/.ci_support/osx_64_libcurl8libdeflate1.12.yaml @@ -7,7 +7,7 @@ bzip2: c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_64_libcurl8libdeflate1.13.yaml b/.ci_support/osx_64_libcurl8libdeflate1.13.yaml index 4e8ac8c..96fadd1 100644 --- a/.ci_support/osx_64_libcurl8libdeflate1.13.yaml +++ b/.ci_support/osx_64_libcurl8libdeflate1.13.yaml @@ -7,7 +7,7 @@ bzip2: c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_64_libcurl8libdeflate1.14.yaml b/.ci_support/osx_64_libcurl8libdeflate1.14.yaml index dfdfb50..9469d5e 100644 --- a/.ci_support/osx_64_libcurl8libdeflate1.14.yaml +++ b/.ci_support/osx_64_libcurl8libdeflate1.14.yaml @@ -7,7 +7,7 @@ bzip2: c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_64_libcurl8libdeflate1.16.yaml b/.ci_support/osx_64_libcurl8libdeflate1.16.yaml index 2b0f232..e62ade1 100644 --- a/.ci_support/osx_64_libcurl8libdeflate1.16.yaml +++ b/.ci_support/osx_64_libcurl8libdeflate1.16.yaml @@ -7,7 +7,7 @@ bzip2: c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_64_libcurl8libdeflate1.17.yaml b/.ci_support/osx_64_libcurl8libdeflate1.17.yaml index 23e5132..a617657 100644 --- a/.ci_support/osx_64_libcurl8libdeflate1.17.yaml +++ b/.ci_support/osx_64_libcurl8libdeflate1.17.yaml @@ -7,7 +7,7 @@ bzip2: c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_arm64_libcurl7libdeflate1.12.yaml b/.ci_support/osx_arm64_libcurl7libdeflate1.12.yaml index 976f244..425cc59 100644 --- a/.ci_support/osx_arm64_libcurl7libdeflate1.12.yaml +++ b/.ci_support/osx_arm64_libcurl7libdeflate1.12.yaml @@ -5,7 +5,7 @@ bzip2: c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_arm64_libcurl7libdeflate1.13.yaml b/.ci_support/osx_arm64_libcurl7libdeflate1.13.yaml index 57badfd..cbf9164 100644 --- a/.ci_support/osx_arm64_libcurl7libdeflate1.13.yaml +++ b/.ci_support/osx_arm64_libcurl7libdeflate1.13.yaml @@ -5,7 +5,7 @@ bzip2: c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_arm64_libcurl7libdeflate1.14.yaml b/.ci_support/osx_arm64_libcurl7libdeflate1.14.yaml index f6e2427..2199552 100644 --- a/.ci_support/osx_arm64_libcurl7libdeflate1.14.yaml +++ b/.ci_support/osx_arm64_libcurl7libdeflate1.14.yaml @@ -5,7 +5,7 @@ bzip2: c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_arm64_libcurl7libdeflate1.16.yaml b/.ci_support/osx_arm64_libcurl7libdeflate1.16.yaml index 3aa2222..92a150c 100644 --- a/.ci_support/osx_arm64_libcurl7libdeflate1.16.yaml +++ b/.ci_support/osx_arm64_libcurl7libdeflate1.16.yaml @@ -5,7 +5,7 @@ bzip2: c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_arm64_libcurl7libdeflate1.17.yaml b/.ci_support/osx_arm64_libcurl7libdeflate1.17.yaml index c44e5f4..71cd88a 100644 --- a/.ci_support/osx_arm64_libcurl7libdeflate1.17.yaml +++ b/.ci_support/osx_arm64_libcurl7libdeflate1.17.yaml @@ -5,7 +5,7 @@ bzip2: c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_arm64_libcurl8libdeflate1.12.yaml b/.ci_support/osx_arm64_libcurl8libdeflate1.12.yaml index 3d75790..b564a0e 100644 --- a/.ci_support/osx_arm64_libcurl8libdeflate1.12.yaml +++ b/.ci_support/osx_arm64_libcurl8libdeflate1.12.yaml @@ -5,7 +5,7 @@ bzip2: c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_arm64_libcurl8libdeflate1.13.yaml b/.ci_support/osx_arm64_libcurl8libdeflate1.13.yaml index ce4d496..7e04a3b 100644 --- a/.ci_support/osx_arm64_libcurl8libdeflate1.13.yaml +++ b/.ci_support/osx_arm64_libcurl8libdeflate1.13.yaml @@ -5,7 +5,7 @@ bzip2: c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_arm64_libcurl8libdeflate1.14.yaml b/.ci_support/osx_arm64_libcurl8libdeflate1.14.yaml index ecf53ef..70d5628 100644 --- a/.ci_support/osx_arm64_libcurl8libdeflate1.14.yaml +++ b/.ci_support/osx_arm64_libcurl8libdeflate1.14.yaml @@ -5,7 +5,7 @@ bzip2: c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_arm64_libcurl8libdeflate1.16.yaml b/.ci_support/osx_arm64_libcurl8libdeflate1.16.yaml index 65d03a4..05b47e3 100644 --- a/.ci_support/osx_arm64_libcurl8libdeflate1.16.yaml +++ b/.ci_support/osx_arm64_libcurl8libdeflate1.16.yaml @@ -5,7 +5,7 @@ bzip2: c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_arm64_libcurl8libdeflate1.17.yaml b/.ci_support/osx_arm64_libcurl8libdeflate1.17.yaml index b90df8e..0124a6d 100644 --- a/.ci_support/osx_arm64_libcurl8libdeflate1.17.yaml +++ b/.ci_support/osx_arm64_libcurl8libdeflate1.17.yaml @@ -5,7 +5,7 @@ bzip2: c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index a6b09f6..eba1dfd 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -28,14 +28,15 @@ conda-build: pkgs_dirs: - ${FEEDSTOCK_ROOT}/build_artifacts/pkg_cache - /opt/conda/pkgs +solver: libmamba CONDARC +export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 - -mamba install --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 -mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 +mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ + pip mamba conda-build boa conda-forge-ci-setup=4 +mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ + pip mamba conda-build boa conda-forge-ci-setup=4 # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -56,6 +57,12 @@ if [[ -f "${FEEDSTOCK_ROOT}/LICENSE.txt" ]]; then cp "${FEEDSTOCK_ROOT}/LICENSE.txt" "${RECIPE_ROOT}/recipe-scripts-license.txt" fi +if [[ "${sha:-}" == "" ]]; then + pushd ${FEEDSTOCK_ROOT} + sha=$(git rev-parse HEAD) + popd +fi + if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then if [[ "x${BUILD_OUTPUT_ID:-}" != "x" ]]; then EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --output-id ${BUILD_OUTPUT_ID}" @@ -69,7 +76,8 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then else conda mambabuild "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ - --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" + --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \ + --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/.scripts/logging_utils.sh b/.scripts/logging_utils.sh index 57bc95c..aff009f 100644 --- a/.scripts/logging_utils.sh +++ b/.scripts/logging_utils.sh @@ -12,7 +12,7 @@ function startgroup { echo "##[group]$1";; travis ) echo "$1" - echo -en 'travis_fold:start:'"${1// /}"'\\r';; + echo -en 'travis_fold:start:'"${1// /}"'\r';; github_actions ) echo "::group::$1";; * ) @@ -28,7 +28,7 @@ function endgroup { azure ) echo "##[endgroup]";; travis ) - echo -en 'travis_fold:end:'"${1// /}"'\\r';; + echo -en 'travis_fold:end:'"${1// /}"'\r';; github_actions ) echo "::endgroup::";; esac diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh index 9236239..b70ef01 100755 --- a/.scripts/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -91,6 +91,9 @@ docker run ${DOCKER_RUN_ARGS} \ -e CPU_COUNT \ -e BUILD_WITH_CONDA_DEBUG \ -e BUILD_OUTPUT_ID \ + -e flow_run_id \ + -e remote_url \ + -e sha \ -e BINSTAR_TOKEN \ -e FEEDSTOCK_TOKEN \ -e STAGING_BINSTAR_TOKEN \ diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index bb00584..9259eb9 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -22,11 +22,13 @@ bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} source ${MINIFORGE_HOME}/etc/profile.d/conda.sh conda activate base +export CONDA_SOLVER="libmamba" +export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 -mamba install --update-specs --quiet --yes --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 -mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 +mamba install --update-specs --quiet --yes --channel conda-forge --strict-channel-priority \ + pip mamba conda-build boa conda-forge-ci-setup=4 +mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ + pip mamba conda-build boa conda-forge-ci-setup=4 @@ -45,6 +47,10 @@ else echo -e "\n\nNot mangling homebrew as we are not running in CI" fi +if [[ "${sha:-}" == "" ]]; then + sha=$(git rev-parse HEAD) +fi + echo -e "\n\nRunning the build setup script." source run_conda_forge_build_setup @@ -55,11 +61,6 @@ source run_conda_forge_build_setup echo -e "\n\nMaking the build clobber file" make_build_number ./ ./recipe ./.ci_support/${CONFIG}.yaml -if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]]; then - EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" -fi - - if [[ -f LICENSE.txt ]]; then cp LICENSE.txt "recipe/recipe-scripts-license.txt" fi @@ -75,9 +76,15 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then # Drop into an interactive shell /bin/bash else + + if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]]; then + EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" + fi + conda mambabuild ./recipe -m ./.ci_support/${CONFIG}.yaml \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ - --clobber-file ./.ci_support/clobber_${CONFIG}.yaml + --clobber-file ./.ci_support/clobber_${CONFIG}.yaml \ + --extra-meta flow_run_id="$flow_run_id" remote_url="$remote_url" sha="$sha" ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" From 8f230bb130a19975e039d8898c01ea2fbe52f107 Mon Sep 17 00:00:00 2001 From: John Blischak Date: Wed, 6 Dec 2023 13:52:18 -0500 Subject: [PATCH 2/2] Bump build number --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index b6d2333..24237f5 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -5,7 +5,7 @@ package: version: {{ version }} build: - number: 5 + number: 6 run_exports: - {{ pin_subpackage('htslib', max_pin='x.x') }}