Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Unify Windows batch logic #1761

Merged
merged 14 commits into from
Sep 8, 2023
Merged

Conversation

jaimergp
Copy link
Member

@jaimergp jaimergp commented Sep 6, 2023

Checklist

  • Added a news entry

We had duplicate logic for Azure and Github Actions, which was resulting in duplicated efforts in PRs like #1732, and divergence of features/bugfixes (GHA didn't have python=3.10, UPLOAD_ON_BRANCH or the %TEMP% fixes for anaconda upload ...).

In this PR I am hoping to unify both in a single script, which should also get us closer to having build-locally.py features for Windows. The downside is that the Azure build steps will be now a single one, which is not terrible and can be worked with logging groups like we do in Unix if needed.

One thing to pay special attention to is the error handling on CMD. It can be terribly confusing depending on too many edge cases (see #1704, I will probably restart work on that after this one lands).

Tests:

jaimergp added a commit to jaimergp/dav1d-feedstock that referenced this pull request Sep 6, 2023
jaimergp added a commit to jaimergp-feedstocks/dav1d-feedstock that referenced this pull request Sep 6, 2023
@jaimergp jaimergp marked this pull request as ready for review September 6, 2023 13:26
@@ -941,7 +941,7 @@ def _get_build_setup_line(forge_dir, platform, forge_config):
if platform == "win":
build_setup += textwrap.dedent(
"""\
run_conda_forge_build_setup
CALL run_conda_forge_build_setup
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Without using CALL, this batch script coming from conda-forge-ci-setup might (will?) exit early with errorlevel = 0, misreporting success without even running the recipe.

@jaimergp
Copy link
Member Author

jaimergp commented Sep 6, 2023

@conda-forge/core - ready for review!

Copy link
Member

@beckermr beckermr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know nothing about windows but it it works, LGTM!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants