diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 62086bb..9cec39b 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -13,21 +13,21 @@ jobs: UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 SHORT_CONFIG: win_arm64_cl_version19.16.27033cros_h10441f7228 - win_arm64_cl_version19.29.30139cros_h5ab1bbeecd: - CONFIG: win_arm64_cl_version19.29.30139cros_h5ab1bbeecd + win_arm64_cl_version19.29.30139cros_hdf27cf77b5: + CONFIG: win_arm64_cl_version19.29.30139cros_hdf27cf77b5 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - SHORT_CONFIG: win_arm64_cl_version19.29.30139cros_h5ab1bbeecd - win_arm64_cl_version19.37.32822cros_h9bdb558ad7: - CONFIG: win_arm64_cl_version19.37.32822cros_h9bdb558ad7 + SHORT_CONFIG: win_arm64_cl_version19.29.30139cros_hdf27cf77b5 + win_arm64_cl_version19.38.33130cros_h78f5b8adaf: + CONFIG: win_arm64_cl_version19.38.33130cros_h78f5b8adaf UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - SHORT_CONFIG: win_arm64_cl_version19.37.32822cros_h9bdb558ad7 - win_arm64_cl_version19.37.32822cros_ha1107d439d: - CONFIG: win_arm64_cl_version19.37.32822cros_ha1107d439d + SHORT_CONFIG: win_arm64_cl_version19.38.33130cros_h78f5b8adaf + win_arm64_cl_version19.38.33130cros_h82d496f611: + CONFIG: win_arm64_cl_version19.38.33130cros_h82d496f611 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - SHORT_CONFIG: win_arm64_cl_version19.37.32822cros_ha1107d439d + SHORT_CONFIG: win_arm64_cl_version19.38.33130cros_h82d496f611 timeoutInMinutes: 360 steps: @@ -41,6 +41,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-win.yml b/.azure-pipelines/azure-pipelines-win.yml index da7ddee..a5bf301 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -16,20 +16,21 @@ jobs: CONFIG: win_64_cl_version19.29.30139cross_t_h16fbe5123a UPLOAD_PACKAGES: 'True' SHORT_CONFIG: win_64_cl_version19.29.30139cross_t_h16fbe5123a - win_64_cl_version19.37.32822cross_t_h5bb07cb262: - CONFIG: win_64_cl_version19.37.32822cross_t_h5bb07cb262 + win_64_cl_version19.38.33130cross_t_hae6817084a: + CONFIG: win_64_cl_version19.38.33130cross_t_hae6817084a UPLOAD_PACKAGES: 'True' - SHORT_CONFIG: win_64_cl_version19.37.32822cross_t_h5bb07cb262 - win_64_cl_version19.37.32822cross_t_hb0fc03c3d5: - CONFIG: win_64_cl_version19.37.32822cross_t_hb0fc03c3d5 + SHORT_CONFIG: win_64_cl_version19.38.33130cross_t_hae6817084a + win_64_cl_version19.38.33130cross_t_hb91178803b: + CONFIG: win_64_cl_version19.38.33130cross_t_hb91178803b UPLOAD_PACKAGES: 'True' - SHORT_CONFIG: win_64_cl_version19.37.32822cross_t_hb0fc03c3d5 + SHORT_CONFIG: win_64_cl_version19.38.33130cross_t_hb91178803b timeoutInMinutes: 360 variables: CONDA_BLD_PATH: D:\\bld\\ UPLOAD_TEMP: D:\\tmp steps: + - task: PythonScript@0 displayName: 'Download Miniforge' inputs: @@ -48,38 +49,20 @@ 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 + CONFIG: $(CONFIG) + CI: azure + flow_run_id: azure_$(Build.BuildNumber).$(System.JobAttempt) + remote_url: $(Build.Repository.Uri) + sha: $(Build.SourceVersion) + UPLOAD_PACKAGES: $(UPLOAD_PACKAGES) + UPLOAD_TEMP: $(UPLOAD_TEMP) + BINSTAR_TOKEN: $(BINSTAR_TOKEN) + FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) + STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) - script: | set CI=azure set CI_RUN_ID=$(build.BuildNumber).$(system.JobAttempt) @@ -106,24 +89,4 @@ jobs: condition: not(eq(variables.ENV_ARTIFACT_PATH, '')) inputs: targetPath: $(ENV_ARTIFACT_PATH) - artifactName: $(ENV_ARTIFACT_NAME) - - 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: - 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 + artifactName: $(ENV_ARTIFACT_NAME) \ No newline at end of file diff --git a/.ci_support/win_64_cl_version19.37.32822cross_t_hb0fc03c3d5.yaml b/.ci_support/win_64_cl_version19.38.33130cross_t_hae6817084a.yaml similarity index 73% rename from .ci_support/win_64_cl_version19.37.32822cross_t_hb0fc03c3d5.yaml rename to .ci_support/win_64_cl_version19.38.33130cross_t_hae6817084a.yaml index 535fde5..c6c6847 100644 --- a/.ci_support/win_64_cl_version19.37.32822cross_t_hb0fc03c3d5.yaml +++ b/.ci_support/win_64_cl_version19.38.33130cross_t_hae6817084a.yaml @@ -3,19 +3,19 @@ channel_sources: channel_targets: - conda-forge main cl_version: -- 19.37.32822 +- 19.38.33130 cross_target_platform: - win-64 runtime_version: -- 14.36.32532 +- 14.38.33130 sha256: -- 917C37D816488545B70AFFD77D6E486E4DD27E2ECE63F6BBAAF486B178B2B888 +- 4DFE83C91124CD542F4222FE2C396CABEAC617BB6F59BDCBDF89FD6F0DF0A32F target_platform: - win-64 update_version: -- '7' +- '8' uuid: -- eaab1f82-787d-4fd7-8c73-f782341a0c63 +- a061be25-c14a-489a-8c7c-bb72adfb3cab vc: - '14' vcver: diff --git a/.ci_support/win_64_cl_version19.37.32822cross_t_h5bb07cb262.yaml b/.ci_support/win_64_cl_version19.38.33130cross_t_hb91178803b.yaml similarity index 73% rename from .ci_support/win_64_cl_version19.37.32822cross_t_h5bb07cb262.yaml rename to .ci_support/win_64_cl_version19.38.33130cross_t_hb91178803b.yaml index e3014fa..b236b96 100644 --- a/.ci_support/win_64_cl_version19.37.32822cross_t_h5bb07cb262.yaml +++ b/.ci_support/win_64_cl_version19.38.33130cross_t_hb91178803b.yaml @@ -3,19 +3,19 @@ channel_sources: channel_targets: - conda-forge main cl_version: -- 19.37.32822 +- 19.38.33130 cross_target_platform: - win-arm64 runtime_version: -- 14.36.32532 +- 14.38.33130 sha256: -- 37342E0ABDAEAE0297F64A889F842AC9453139639FB0178C0754A7D2F330043A +- BAC344CBC947DB8E306986BFB45A33052E1AAEE8F104ADBD9E461EB8199E27D2 target_platform: - win-64 update_version: -- '7' +- '8' uuid: -- eaab1f82-787d-4fd7-8c73-f782341a0c63 +- a061be25-c14a-489a-8c7c-bb72adfb3cab vc: - '14' vcver: diff --git a/.ci_support/win_arm64_cl_version19.37.32822cros_h9bdb558ad7.yaml b/.ci_support/win_arm64_cl_version19.29.30139cros_hdf27cf77b5.yaml similarity index 71% rename from .ci_support/win_arm64_cl_version19.37.32822cros_h9bdb558ad7.yaml rename to .ci_support/win_arm64_cl_version19.29.30139cros_hdf27cf77b5.yaml index 5e26256..81c808e 100644 --- a/.ci_support/win_arm64_cl_version19.37.32822cros_h9bdb558ad7.yaml +++ b/.ci_support/win_arm64_cl_version19.29.30139cros_hdf27cf77b5.yaml @@ -3,29 +3,29 @@ channel_sources: channel_targets: - conda-forge main cl_version: -- 19.37.32822 +- 19.29.30139 cross_target_platform: - win-64 docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 runtime_version: -- 14.36.32532 +- 14.29.30139 sha256: -- 917C37D816488545B70AFFD77D6E486E4DD27E2ECE63F6BBAAF486B178B2B888 +- 4DFE83C91124CD542F4222FE2C396CABEAC617BB6F59BDCBDF89FD6F0DF0A32F target_platform: - win-arm64 update_version: -- '7' +- '11' uuid: -- eaab1f82-787d-4fd7-8c73-f782341a0c63 +- a061be25-c14a-489a-8c7c-bb72adfb3cab vc: - '14' vcver: -- '14.3' +- '14.2' vsver: -- '17' +- '16' vsyear: -- '2022' +- '2019' zip_keys: - - vcver - vsyear diff --git a/.ci_support/win_arm64_cl_version19.29.30139cros_h5ab1bbeecd.yaml b/.ci_support/win_arm64_cl_version19.38.33130cros_h78f5b8adaf.yaml similarity index 89% rename from .ci_support/win_arm64_cl_version19.29.30139cros_h5ab1bbeecd.yaml rename to .ci_support/win_arm64_cl_version19.38.33130cros_h78f5b8adaf.yaml index 6a3a146..5d3e8d2 100644 --- a/.ci_support/win_arm64_cl_version19.29.30139cros_h5ab1bbeecd.yaml +++ b/.ci_support/win_arm64_cl_version19.38.33130cros_h78f5b8adaf.yaml @@ -3,29 +3,29 @@ channel_sources: channel_targets: - conda-forge main cl_version: -- 19.29.30139 +- 19.38.33130 cross_target_platform: - win-64 docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 runtime_version: -- 14.29.30139 +- 14.38.33130 sha256: - 296F96CD102250636BCD23AB6E6CF70935337B1BBB3507FE8521D8D9CFAA932F target_platform: - win-arm64 update_version: -- '11' +- '8' uuid: - b929b7fe-5c89-4553-9abe-6324631dcc3a vc: - '14' vcver: -- '14.2' +- '14.3' vsver: -- '16' +- '17' vsyear: -- '2019' +- '2022' zip_keys: - - vcver - vsyear diff --git a/.ci_support/win_arm64_cl_version19.37.32822cros_ha1107d439d.yaml b/.ci_support/win_arm64_cl_version19.38.33130cros_h82d496f611.yaml similarity index 76% rename from .ci_support/win_arm64_cl_version19.37.32822cros_ha1107d439d.yaml rename to .ci_support/win_arm64_cl_version19.38.33130cros_h82d496f611.yaml index ab19956..2fc12a2 100644 --- a/.ci_support/win_arm64_cl_version19.37.32822cros_ha1107d439d.yaml +++ b/.ci_support/win_arm64_cl_version19.38.33130cros_h82d496f611.yaml @@ -3,21 +3,21 @@ channel_sources: channel_targets: - conda-forge main cl_version: -- 19.37.32822 +- 19.38.33130 cross_target_platform: - win-arm64 docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 runtime_version: -- 14.36.32532 +- 14.38.33130 sha256: -- 37342E0ABDAEAE0297F64A889F842AC9453139639FB0178C0754A7D2F330043A +- BAC344CBC947DB8E306986BFB45A33052E1AAEE8F104ADBD9E461EB8199E27D2 target_platform: - win-arm64 update_version: -- '7' +- '8' uuid: -- eaab1f82-787d-4fd7-8c73-f782341a0c63 +- a061be25-c14a-489a-8c7c-bb72adfb3cab vc: - '14' vcver: 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_win_build.bat b/.scripts/run_win_build.bat new file mode 100644 index 0000000..48734de --- /dev/null +++ b/.scripts/run_win_build.bat @@ -0,0 +1,125 @@ +:: 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 +:: Configure the solver +set "CONDA_SOLVER=libmamba" +if !errorlevel! neq 0 exit /b !errorlevel! +set "CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1" + +:: 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=4 -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%] ( + if [%CROSSCOMPILING_EMULATOR%] == [] ( + set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --no-test" + ) +) + +if NOT [%flow_run_id%] == [] ( + set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --extra-meta flow_run_id=%flow_run_id% remote_url=%remote_url% sha=%sha%" +) + +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 diff --git a/README.md b/README.md index 23cd35e..2a2b0f6 100644 --- a/README.md +++ b/README.md @@ -11,25 +11,7 @@ Home: https://docs.microsoft.com/en-us/visualstudio/windows/?view=vs- Package license: LicenseRef-ProprietaryMicrosoft -Summary: Activation and version verification of MSVC (VS compiler, update ) - -About vs2022_win-arm64 ----------------------- - - - -Package license: BSD-3-Clause - -Summary: Activation and version verification of MSVC 14.3 (VS 2022 compiler, update 7) - -About vs_win-arm64 ------------------- - - - -Package license: BSD-3-Clause - -Summary: Activation and version verification of MSVC 14.3 (VS 2022 compiler, update 7) +Summary: Activation and version verification of MSVC (VS compiler, update update_version) About vc14_runtime ------------------ @@ -38,16 +20,16 @@ Home: https://visualstudio.microsoft.com/downloads/ Package license: LicenseRef-ProprietaryMicrosoft -Summary: MSVC runtimes associated with cl.exe version 19.37.32822 (VS 2022 update 7) +Summary: MSVC runtimes associated with cl.exe version 19.38.33130 (VS 2022 update 8) -About vs2019_win-64 +About vs2017_win-64 ------------------- Package license: BSD-3-Clause -Summary: Activation and version verification of MSVC 14.2 (VS 2019 compiler, update 11) +Summary: Activation and version verification of MSVC 14.1 (VS 2017 compiler, update 9) About vc -------- @@ -80,25 +62,43 @@ About vs_win-64 Package license: BSD-3-Clause -Summary: Activation and version verification of MSVC 14.3 (VS 2022 compiler, update 7) +Summary: Activation and version verification of MSVC 14.2 (VS 2019 compiler, update 11) -About vs2017_win-64 +About vs2022_win-64 ------------------- Package license: BSD-3-Clause -Summary: Activation and version verification of MSVC 14.1 (VS 2017 compiler, update 9) +Summary: Activation and version verification of MSVC 14.3 (VS 2022 compiler, update 8) -About vs2022_win-64 +About vs2019_win-64 ------------------- Package license: BSD-3-Clause -Summary: Activation and version verification of MSVC 14.3 (VS 2022 compiler, update 7) +Summary: Activation and version verification of MSVC 14.2 (VS 2019 compiler, update 11) + +About vs2022_win-arm64 +---------------------- + + + +Package license: BSD-3-Clause + +Summary: Activation and version verification of MSVC 14.3 (VS 2022 compiler, update 8) + +About vs_win-arm64 +------------------ + + + +Package license: BSD-3-Clause + +Summary: Activation and version verification of MSVC 14.3 (VS 2022 compiler, update 8) Current build status ==================== @@ -132,17 +132,17 @@ Current build status - win_64_cl_version19.37.32822cross_t_h5bb07cb262 + win_64_cl_version19.38.33130cross_t_hae6817084a - variant + variant - win_64_cl_version19.37.32822cross_t_hb0fc03c3d5 + win_64_cl_version19.38.33130cross_t_hb91178803b - variant + variant @@ -153,24 +153,24 @@ Current build status - win_arm64_cl_version19.29.30139cros_h5ab1bbeecd + win_arm64_cl_version19.29.30139cros_hdf27cf77b5 - variant + variant - win_arm64_cl_version19.37.32822cros_h9bdb558ad7 + win_arm64_cl_version19.38.33130cros_h78f5b8adaf - variant + variant - win_arm64_cl_version19.37.32822cros_ha1107d439d + win_arm64_cl_version19.38.33130cros_h82d496f611 - variant + variant @@ -262,7 +262,7 @@ available continuous integration services. Thanks to the awesome service provide [CircleCI](https://circleci.com/), [AppVeyor](https://www.appveyor.com/), [Drone](https://cloud.drone.io/welcome), and [TravisCI](https://travis-ci.com/) it is possible to build and upload installable packages to the -[conda-forge](https://anaconda.org/conda-forge) [Anaconda-Cloud](https://anaconda.org/) +[conda-forge](https://anaconda.org/conda-forge) [anaconda.org](https://anaconda.org/) channel for Linux, Windows and OSX respectively. To manage the continuous integration and simplify feedstock maintenance diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index b1f4aef..b782551 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -16,35 +16,35 @@ vsver: runtime_version: # the azure/github images only contain the latest minor version per vs-line; # if there is a use-case for having older minor versions, they can be added when requested. - - 14.36.32532 - - 14.36.32532 + - 14.38.33130 + - 14.38.33130 - 14.29.30139 - 14.16.27033 # the VS update version. This is the middle digit in the version # reported in the VS help->about UI. It is perhaps a more readily # referenceable number. update_version: - - 7 - - 7 + - 8 + - 8 - 11 - 9 # This is the version number reported by cl.exe cl_version: - - 19.37.32822 - - 19.37.32822 + - 19.38.33130 + - 19.38.33130 - 19.29.30139 - 19.16.27033 # This is the uuid in the URL; redirect can be resolved e.g. as follows # curl -ILSs https://aka.ms/vs/17/release/vc_redist.x64.exe | grep "Location:" # curl -ILSs https://aka.ms/vs/17/release/vc_redist.arm64.exe | grep "Location:" uuid: - - eaab1f82-787d-4fd7-8c73-f782341a0c63 - - eaab1f82-787d-4fd7-8c73-f782341a0c63 + - a061be25-c14a-489a-8c7c-bb72adfb3cab + - a061be25-c14a-489a-8c7c-bb72adfb3cab - b929b7fe-5c89-4553-9abe-6324631dcc3a - 4100b84d-1b4d-487d-9f89-1354a7138c8f sha256: - - 37342E0ABDAEAE0297F64A889F842AC9453139639FB0178C0754A7D2F330043A - - 917C37D816488545B70AFFD77D6E486E4DD27E2ECE63F6BBAAF486B178B2B888 + - BAC344CBC947DB8E306986BFB45A33052E1AAEE8F104ADBD9E461EB8199E27D2 + - 4DFE83C91124CD542F4222FE2C396CABEAC617BB6F59BDCBDF89FD6F0DF0A32F - 296F96CD102250636BCD23AB6E6CF70935337B1BBB3507FE8521D8D9CFAA932F - 5B0CBB977F2F5253B1EBE5C9D30EDBDA35DBD68FB70DE7AF5FAAC6423DB575B5 cross_target_platform: diff --git a/recipe/meta.yaml b/recipe/meta.yaml index f5d036e..642e9e5 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -15,7 +15,8 @@ {% endif %} {% set vc_major = vcver.split(".")[0] %} -{% set build_num = 17 %} +{% set vcvars_ver = ".".join(runtime_version.split(".")[:2]) %} +{% set build_num = 18 %} package: name: vs{{ vsyear }} @@ -23,14 +24,14 @@ package: source: # Latest version redirect: https://aka.ms/vs/16/release/vc_redist.x64.exe - - url: https://download.visualstudio.microsoft.com/download/pr/{{ uuid }}/{{ sha256 }}/vc_redist.x64.exe # [cross_target_platform == "win-64"] - sha256: {{ sha256 | lower }} # [cross_target_platform == "win-64"] + - url: https://download.visualstudio.microsoft.com/download/pr/{{ uuid }}/{{ sha256 }}/vc_redist.x64.exe # [cross_target_platform == "win-64"] + sha256: {{ sha256 | lower }} # [cross_target_platform == "win-64"] # Latest version redirect: https://aka.ms/vs/16/release/vc_redist.arm64.exe - - url: https://download.visualstudio.microsoft.com/download/pr/{{ uuid }}/{{ sha256 }}/vc_redist.arm64.exe # [cross_target_platform == "win-arm64"] - sha256: {{ sha256 | lower }} # [cross_target_platform == "win-arm64"] + - url: https://download.visualstudio.microsoft.com/download/pr/{{ uuid }}/{{ sha256 }}/vc_redist.arm64.exe # [cross_target_platform == "win-arm64"] + sha256: {{ sha256 | lower }} # [cross_target_platform == "win-arm64"] # Latest version redirect: https://aka.ms/vs/16/release/vc_redist.x86.exe - - url: https://download.visualstudio.microsoft.com/download/pr/{{ uuid }}/{{ sha256 }}/vc_redist.x86.exe # [cross_target_platform == "win-32"] - sha256: {{ sha256 | lower }} # [cross_target_platform == "win-32"] + - url: https://download.visualstudio.microsoft.com/download/pr/{{ uuid }}/{{ sha256 }}/vc_redist.x86.exe # [cross_target_platform == "win-32"] + sha256: {{ sha256 | lower }} # [cross_target_platform == "win-32"] build: number: {{ build_num }} @@ -124,15 +125,17 @@ outputs: 'vcamp140.dll', 'vccorlib140.dll', 'vcomp140.dll', - 'vcruntime140.dll'] %} + 'vcruntime140.dll', + ] + (vsyear | int >= 2019) * [ + 'msvcp140_atomic_wait.dll', + 'msvcp140_codecvt_ids.dll', + 'vcruntime140_1.dll', + ] + (vsyear | int >= 2022) * [ + 'vcruntime140_threads.dll', + ]%} - if not exist %LIBRARY_BIN%\{{ dllname }} exit 1 - if not exist %PREFIX%\{{ dllname }} exit 1 {% endfor %} - {% if vsyear == "2019" %} - - if not exist %LIBRARY_BIN%\vcruntime140_1.dll exit 1 - - if not exist %LIBRARY_BIN%\msvcp140_atomic_wait.dll exit 1 - - if not exist %LIBRARY_BIN%\msvcp140_codecvt_ids.dll exit 1 - {% endif %} - name: vs{{ runtime_year }}_runtime version: {{ runtime_version }} @@ -182,7 +185,7 @@ outputs: python -m vc_repack --activate --host-platform {{ target_platform }} --target-platform {{ cross_target_platform }} --version {{ runtime_version }} --activate-year {{ vsyear }} --activate-major {{ vsver }} --activate-vcver {{ vcver }} - --activate-vcvars-ver {{ cl_version.split(".")[0]|int - 5 }}.{{ cl_version.split(".")[1] }} + --activate-vcvars-ver {{ vcvars_ver }} build: track_features: - vc{{ vc_major }}