From 099c8a3a7324419354585f88576b1f54f5953e74 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 29 Sep 2023 01:25:38 +0000 Subject: [PATCH 1/5] Rebuild for libboost 1.82 --- .../migrations/boost_cpp_to_libboost.yaml | 20 +++++++++++++++++++ recipe/meta.yaml | 8 ++++---- 2 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 .ci_support/migrations/boost_cpp_to_libboost.yaml diff --git a/.ci_support/migrations/boost_cpp_to_libboost.yaml b/.ci_support/migrations/boost_cpp_to_libboost.yaml new file mode 100644 index 0000000..c2ffc25 --- /dev/null +++ b/.ci_support/migrations/boost_cpp_to_libboost.yaml @@ -0,0 +1,20 @@ +migrator_ts: 1695775149 +__migrator: + kind: version + migration_number: 1 + bump_number: 1 + commit_message: "Rebuild for libboost 1.82" + # limit the number of prs to do the initial test + pr_limit: 1 +libboost_devel: + - 1.82 +# This migration is matched with a piggy-back migrator +# (see https://github.com/regro/cf-scripts/pull/1668) +# that will replace boost-cpp with libboost-devel +boost_cpp: + - 1.82 +# same for boost -> libboost-python-devel +libboost_python_devel: + - 1.82 +boost: + - 1.82 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 06b15cc..2df73f2 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -12,7 +12,7 @@ source: - patches/0002-Add-boost-throw_exception-implementation.patch # [win] build: - number: 0 + number: 1 run_exports: - {{ pin_subpackage("libthrift", max_pin="x.x.x") }} ignore_run_exports_from: @@ -30,7 +30,7 @@ requirements: - flex # [unix] - winflexbison # [win] host: - - boost-cpp + - libboost-devel - libevent - openssl - zlib @@ -50,7 +50,7 @@ outputs: - cmake - ninja host: - - boost-cpp + - libboost-headers - libevent - openssl - zlib @@ -110,7 +110,7 @@ outputs: - ninja host: - {{ pin_subpackage("libthrift", exact=true) }} - - boost-cpp + - libboost-headers - libevent - openssl - zlib From c49c68e0ee20775d8788dd5166c69c37acf6da19 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 29 Sep 2023 01:26:00 +0000 Subject: [PATCH 2/5] MNT: Re-rendered with conda-build 3.26.1, conda-smithy 3.26.3, and conda-forge-pinning 2023.09.28.23.05.41 --- .azure-pipelines/azure-pipelines-win.yml | 56 ++--------- .ci_support/linux_64_.yaml | 7 +- .ci_support/linux_aarch64_.yaml | 7 +- .ci_support/linux_ppc64le_.yaml | 7 +- .ci_support/osx_64_.yaml | 7 +- .ci_support/osx_arm64_.yaml | 7 +- .ci_support/win_64_.yaml | 7 +- .scripts/build_steps.sh | 9 +- .scripts/logging_utils.sh | 4 +- .scripts/run_osx_build.sh | 8 +- .scripts/run_win_build.bat | 115 +++++++++++++++++++++++ 11 files changed, 145 insertions(+), 89 deletions(-) create mode 100755 .scripts/run_win_build.bat diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index d66c7d1..82c5318 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -17,6 +17,7 @@ jobs: UPLOAD_TEMP: D:\\tmp steps: + - task: PythonScript@0 displayName: 'Download Miniforge' inputs: @@ -35,55 +36,14 @@ jobs: displayName: Add conda to PATH - script: | - call activate base - mamba.exe install "python=3.10" conda-build conda pip boa conda-forge-ci-setup=3 -c conda-forge --strict-channel-priority --yes - displayName: Install conda-build - - - script: set PYTHONUNBUFFERED=1 - displayName: Set PYTHONUNBUFFERED - - # Configure the VM - - script: | - call activate base - setup_conda_rc .\ ".\recipe" .\.ci_support\%CONFIG%.yaml - displayName: conda-forge CI setup - - # Configure the VM. - - script: | - set "CI=azure" - call activate base - run_conda_forge_build_setup - displayName: conda-forge build setup - - - script: | - call activate base - if EXIST LICENSE.txt ( - copy LICENSE.txt "recipe\\recipe-scripts-license.txt" - ) - if NOT [%HOST_PLATFORM%] == [%BUILD_PLATFORM%] ( - set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --no-test" - ) - conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% - displayName: Build recipe + call ".scripts\run_win_build.bat" + displayName: Run Windows build env: PYTHONUNBUFFERED: 1 - - script: | - set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" - call activate base - validate_recipe_outputs "%FEEDSTOCK_NAME%" - displayName: Validate Recipe Outputs - - - script: | - set "GIT_BRANCH=%BUILD_SOURCEBRANCHNAME%" - set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" - set "TEMP=$(UPLOAD_TEMP)" - if not exist "%TEMP%\" md "%TEMP%" - set "TMP=%TEMP%" - call activate base - upload_package --validate --feedstock-name="%FEEDSTOCK_NAME%" .\ ".\recipe" .ci_support\%CONFIG%.yaml - displayName: Upload package - env: + CONFIG: $(CONFIG) + CI: azure + UPLOAD_PACKAGES: $(UPLOAD_PACKAGES) + UPLOAD_TEMP: $(UPLOAD_TEMP) BINSTAR_TOKEN: $(BINSTAR_TOKEN) FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) - STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) - condition: and(succeeded(), not(eq(variables['UPLOAD_PACKAGES'], 'False')), not(eq(variables['Build.Reason'], 'PullRequest'))) \ No newline at end of file + STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) \ No newline at end of file diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index df5413c..6181176 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -1,5 +1,3 @@ -boost_cpp: -- 1.78.0 c_compiler: - gcc c_compiler_version: @@ -16,13 +14,12 @@ cxx_compiler_version: - '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 +libboost_devel: +- '1.82' libevent: - 2.1.12 openssl: - '3' -pin_run_as_build: - boost-cpp: - max_pin: x.x.x target_platform: - linux-64 zip_keys: diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index 45b46fd..66edeb6 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -1,7 +1,5 @@ BUILD: - aarch64-conda_cos7-linux-gnu -boost_cpp: -- 1.78.0 c_compiler: - gcc c_compiler_version: @@ -20,13 +18,12 @@ cxx_compiler_version: - '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 +libboost_devel: +- '1.82' libevent: - 2.1.12 openssl: - '3' -pin_run_as_build: - boost-cpp: - max_pin: x.x.x target_platform: - linux-aarch64 zip_keys: diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index 3529acc..af699aa 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -1,5 +1,3 @@ -boost_cpp: -- 1.78.0 c_compiler: - gcc c_compiler_version: @@ -16,13 +14,12 @@ cxx_compiler_version: - '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 +libboost_devel: +- '1.82' libevent: - 2.1.12 openssl: - '3' -pin_run_as_build: - boost-cpp: - max_pin: x.x.x target_platform: - linux-ppc64le zip_keys: diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 26c5916..d076cc6 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -1,7 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' -boost_cpp: -- 1.78.0 c_compiler: - clang c_compiler_version: @@ -14,15 +12,14 @@ cxx_compiler: - clangxx cxx_compiler_version: - '15' +libboost_devel: +- '1.82' libevent: - 2.1.12 macos_machine: - x86_64-apple-darwin13.4.0 openssl: - '3' -pin_run_as_build: - boost-cpp: - max_pin: x.x.x target_platform: - osx-64 zip_keys: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index d811b63..80bfad5 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -1,7 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' -boost_cpp: -- 1.78.0 c_compiler: - clang c_compiler_version: @@ -14,15 +12,14 @@ cxx_compiler: - clangxx cxx_compiler_version: - '15' +libboost_devel: +- '1.82' libevent: - 2.1.12 macos_machine: - arm64-apple-darwin20.0.0 openssl: - '3' -pin_run_as_build: - boost-cpp: - max_pin: x.x.x target_platform: - osx-arm64 zip_keys: diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml index 4267bd9..5485c86 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -1,5 +1,3 @@ -boost_cpp: -- 1.78.0 c_compiler: - vs2019 channel_sources: @@ -8,13 +6,12 @@ channel_targets: - conda-forge main cxx_compiler: - vs2019 +libboost_devel: +- '1.82' libevent: - 2.1.12 openssl: - '3' -pin_run_as_build: - boost-cpp: - max_pin: x.x.x target_platform: - win-64 zlib: diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index a6b09f6..322832b 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -31,11 +31,10 @@ pkgs_dirs: CONDARC - -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=3 +mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ + pip mamba conda-build boa conda-forge-ci-setup # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" 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_osx_build.sh b/.scripts/run_osx_build.sh index 3969edf..cd9a88f 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -23,10 +23,10 @@ bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} source ${MINIFORGE_HOME}/etc/profile.d/conda.sh conda activate base -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=3 +mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ + pip mamba conda-build boa conda-forge-ci-setup diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat new file mode 100755 index 0000000..07d3445 --- /dev/null +++ b/.scripts/run_win_build.bat @@ -0,0 +1,115 @@ +:: PLEASE NOTE: This script has been automatically generated by conda-smithy. Any changes here +:: will be lost next time ``conda smithy rerender`` is run. If you would like to make permanent +:: changes to this script, consider a proposal to conda-smithy so that other feedstocks can also +:: benefit from the improvement. + +:: Note: we assume a Miniforge installation is available + +:: INPUTS (required environment variables) +:: CONFIG: name of the .ci_support/*.yaml file for this job +:: CI: azure, github_actions, or unset +:: UPLOAD_PACKAGES: true or false +:: UPLOAD_ON_BRANCH: true or false + +setlocal enableextensions enabledelayedexpansion + +call :start_group "Configuring conda" + +:: Activate the base conda environment +call activate base + +:: Provision the necessary dependencies to build the recipe later +echo Installing dependencies +mamba.exe install "python=3.10" pip mamba conda-build boa conda-forge-ci-setup=3 -c conda-forge --strict-channel-priority --yes +if !errorlevel! neq 0 exit /b !errorlevel! + +:: Set basic configuration +echo Setting up configuration +setup_conda_rc .\ ".\recipe" .\.ci_support\%CONFIG%.yaml +if !errorlevel! neq 0 exit /b !errorlevel! +echo Running build setup +CALL run_conda_forge_build_setup + + +if !errorlevel! neq 0 exit /b !errorlevel! + +if EXIST LICENSE.txt ( + echo Copying feedstock license + copy LICENSE.txt "recipe\\recipe-scripts-license.txt" +) +if NOT [%HOST_PLATFORM%] == [%BUILD_PLATFORM%] ( + set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --no-test" +) + +call :end_group + +:: Build the recipe +echo Building recipe +conda.exe mambabuild "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 +if /i "%CI%" == "github_actions" ( + set "FEEDSTOCK_NAME=%GITHUB_REPOSITORY:*/=%" + set "GIT_BRANCH=%GITHUB_REF:refs/heads/=%" + if /i "%GITHUB_EVENT_NAME%" == "pull_request" ( + set "IS_PR_BUILD=True" + ) else ( + set "IS_PR_BUILD=False" + ) + set "TEMP=%RUNNER_TEMP%" +) +if /i "%CI%" == "azure" ( + set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" + set "GIT_BRANCH=%BUILD_SOURCEBRANCHNAME%" + if /i "%BUILD_REASON%" == "PullRequest" ( + set "IS_PR_BUILD=True" + ) else ( + set "IS_PR_BUILD=False" + ) + set "TEMP=%UPLOAD_TEMP%" +) + +:: Validate +call :start_group "Validating outputs" +validate_recipe_outputs "%FEEDSTOCK_NAME%" +if !errorlevel! neq 0 exit /b !errorlevel! +call :end_group + +if /i "%UPLOAD_PACKAGES%" == "true" ( + if /i "%IS_PR_BUILD%" == "false" ( + call :start_group "Uploading packages" + if not exist "%TEMP%\" md "%TEMP%" + set "TMP=%TEMP%" + upload_package --validate --feedstock-name="%FEEDSTOCK_NAME%" .\ ".\recipe" .ci_support\%CONFIG%.yaml + if !errorlevel! neq 0 exit /b !errorlevel! + call :end_group + ) +) + +exit + +:: Logging subroutines + +:start_group +if /i "%CI%" == "github_actions" ( + echo ::group::%~1 + exit /b +) +if /i "%CI%" == "azure" ( + echo ##[group]%~1 + exit /b +) +echo %~1 +exit /b + +:end_group +if /i "%CI%" == "github_actions" ( + echo ::endgroup:: + exit /b +) +if /i "%CI%" == "azure" ( + echo ##[endgroup] + exit /b +) +exit /b \ No newline at end of file From c05feb168eaa40fa97a8a66eee78f9716a89f663 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Fri, 29 Sep 2023 13:47:53 +1100 Subject: [PATCH 3/5] boost headers suffice in this case --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 2df73f2..99cd5ae 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -30,7 +30,7 @@ requirements: - flex # [unix] - winflexbison # [win] host: - - libboost-devel + - libboost-headers - libevent - openssl - zlib From 4f64cc7243e9a92b443b928610a66ba47531e9c8 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Fri, 29 Sep 2023 13:49:34 +1100 Subject: [PATCH 4/5] simplify host-deps for thrift-compiler --- recipe/meta.yaml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 99cd5ae..d993cb7 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -104,16 +104,13 @@ outputs: - {{ pin_subpackage("libthrift", max_pin="x.x.x") }} requirements: build: + # for strong run-exports - {{ compiler("c") }} - {{ compiler("cxx") }} - cmake - ninja host: - {{ pin_subpackage("libthrift", exact=true) }} - - libboost-headers - - libevent - - openssl - - zlib run: - {{ pin_subpackage("libthrift", exact=true) }} test: From c0a74237edf9a85201457cbaa8da1cc397f26aef Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Fri, 29 Sep 2023 13:51:48 +1100 Subject: [PATCH 5/5] MNT: Re-rendered with conda-build 3.26.1, conda-smithy 3.26.3, and conda-forge-pinning 2023.09.28.23.05.41 --- .ci_support/linux_64_.yaml | 2 -- .ci_support/linux_aarch64_.yaml | 2 -- .ci_support/linux_ppc64le_.yaml | 2 -- .ci_support/osx_64_.yaml | 2 -- .ci_support/osx_arm64_.yaml | 2 -- .ci_support/win_64_.yaml | 2 -- 6 files changed, 12 deletions(-) diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index 6181176..7ffbfda 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -14,8 +14,6 @@ cxx_compiler_version: - '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 -libboost_devel: -- '1.82' libevent: - 2.1.12 openssl: diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index 66edeb6..dfcfd06 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -18,8 +18,6 @@ cxx_compiler_version: - '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 -libboost_devel: -- '1.82' libevent: - 2.1.12 openssl: diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index af699aa..c1f4128 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -14,8 +14,6 @@ cxx_compiler_version: - '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 -libboost_devel: -- '1.82' libevent: - 2.1.12 openssl: diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index d076cc6..4528be6 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -12,8 +12,6 @@ cxx_compiler: - clangxx cxx_compiler_version: - '15' -libboost_devel: -- '1.82' libevent: - 2.1.12 macos_machine: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 80bfad5..47333db 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -12,8 +12,6 @@ cxx_compiler: - clangxx cxx_compiler_version: - '15' -libboost_devel: -- '1.82' libevent: - 2.1.12 macos_machine: diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml index 5485c86..0a53628 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -6,8 +6,6 @@ channel_targets: - conda-forge main cxx_compiler: - vs2019 -libboost_devel: -- '1.82' libevent: - 2.1.12 openssl: