diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index 7f442b1..e0b8c62 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -28,11 +28,11 @@ pin_run_as_build: target_platform: - linux-64 vtk: -- 9.2.6 +- 9.3.0 zip_keys: - - c_compiler_version - cxx_compiler_version - - c_stdlib_version - cdt_name zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index d939fc6..04d3217 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -32,11 +32,11 @@ pin_run_as_build: target_platform: - linux-aarch64 vtk: -- 9.2.6 +- 9.3.0 zip_keys: - - c_compiler_version - cxx_compiler_version - - c_stdlib_version - cdt_name zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index 1636b6e..644379a 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -28,11 +28,11 @@ pin_run_as_build: target_platform: - linux-ppc64le vtk: -- 9.2.6 +- 9.3.0 zip_keys: - - c_compiler_version - cxx_compiler_version - - c_stdlib_version - cdt_name zlib: -- '1.2' +- '1' diff --git a/.ci_support/migrations/boost1840.yaml b/.ci_support/migrations/boost1840.yaml deleted file mode 100644 index 5d6e74c..0000000 --- a/.ci_support/migrations/boost1840.yaml +++ /dev/null @@ -1,10 +0,0 @@ -__migrator: - build_number: 1 - kind: version - commit_message: "Rebuild for libboost 1.84" - migration_number: 1 -libboost_devel: -- "1.84" -libboost_python_devel: -- "1.84" -migrator_ts: 1700834511.141209 diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 5ebf0b6..4e36d2d 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '10.13' +MACOSX_SDK_VERSION: +- '10.13' c_compiler: - clang c_compiler_version: @@ -28,9 +30,9 @@ pin_run_as_build: target_platform: - osx-64 vtk: -- 9.2.6 +- 9.3.0 zip_keys: - - c_compiler_version - cxx_compiler_version zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index cc67a11..6434a74 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' c_compiler: - clang c_compiler_version: @@ -28,9 +30,9 @@ pin_run_as_build: target_platform: - osx-arm64 vtk: -- 9.2.6 +- 9.3.0 zip_keys: - - c_compiler_version - cxx_compiler_version zlib: -- '1.2' +- '1' diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml index a4deb52..24cf874 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -18,6 +18,6 @@ pin_run_as_build: target_platform: - win-64 vtk: -- 9.2.6 +- 9.3.0 zlib: -- '1.2' +- '1' diff --git a/.gitattributes b/.gitattributes index 7f32763..18f114a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -20,8 +20,8 @@ bld.bat text eol=crlf .travis.yml linguist-generated=true .scripts/* linguist-generated=true .woodpecker.yml linguist-generated=true -LICENSE.txt linguist-generated=true -README.md linguist-generated=true +/LICENSE.txt linguist-generated=true +/README.md linguist-generated=true azure-pipelines.yml linguist-generated=true build-locally.py linguist-generated=true shippable.yml linguist-generated=true diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 9e37a3b..add9a62 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -80,6 +80,13 @@ else --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:-}" + + ( startgroup "Inspecting artifacts" ) 2> /dev/null + + # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" + + ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 07dff21..ba0c879 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -85,6 +85,13 @@ else --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" + + ( startgroup "Inspecting artifacts" ) 2> /dev/null + + # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" + + ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index 6d54697..65650bf 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -58,6 +58,11 @@ echo Building recipe conda-build.exe "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% if !errorlevel! neq 0 exit /b !errorlevel! +call :start_group "Inspecting artifacts" +:: inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 +WHERE inspect_artifacts >nul 2>nul && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" +call :end_group + :: Prepare some environment variables for the upload step if /i "%CI%" == "github_actions" ( set "FEEDSTOCK_NAME=%GITHUB_REPOSITORY:*/=%"