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

Ruby 2.7.2 & Windows support #41

Merged
merged 5 commits into from
Oct 30, 2020
Merged

Conversation

wolfv
Copy link
Member

@wolfv wolfv commented Sep 22, 2020

Checklist

  • Used a personal fork of the feedstock to propose changes
  • Bumped the build number (if the version is unchanged)
  • Reset the build number to 0 (if the version changed)
  • Re-rendered with the latest conda-smithy (Use the phrase @conda-forge-admin, please rerender in a comment in this PR for automated rerendering)
  • Ensured the license file is being packaged.

@conda-forge-linter
Copy link

Hi! This is the friendly automated conda-forge-linting service.

I just wanted to let you know that I linted all conda-recipes in your PR (recipe) and found it was in an excellent condition.

recipe/build.sh Outdated Show resolved Hide resolved
recipe/bld.bat Outdated Show resolved Hide resolved
recipe/meta.yaml Outdated Show resolved Hide resolved
@wolfv
Copy link
Member Author

wolfv commented Sep 22, 2020

btw @timsnyder once I get this working I am happy to rebase on your commits so you get the credit.

@wolfv wolfv changed the title 271 windows Ruby 2.7.2 & Windows support Oct 2, 2020
@wolfv
Copy link
Member Author

wolfv commented Oct 2, 2020

This is ready to go!

recipe/meta.yaml Outdated Show resolved Hide resolved
@wolfv
Copy link
Member Author

wolfv commented Oct 8, 2020

@conda-forge/core I think this is ready to go!

@isuruf
Copy link
Member

isuruf commented Oct 8, 2020

Let's wait for @scopatz, @sodre, @jimmynguyc before asking core to merge.

recipe/deactivate.sh Outdated Show resolved Hide resolved
if not exist %PREFIX%\etc\conda\%%F.d mkdir %PREFIX%\etc\conda\%%F.d
copy %RECIPE_DIR%\%%F.bat %PREFIX%\etc\conda\%%F.d\%PKG_NAME%_%%F.bat
:: Copy unix shell activation scripts, needed by Windows Bash users
copy %RECIPE_DIR%\%%F.sh %PREFIX%\etc\conda\%%F.d\%PKG_NAME%_%%F.sh
Copy link
Member

@scopatz scopatz Oct 8, 2020

Choose a reason for hiding this comment

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

These copies and mkdirs need exit conditions

Copy link
Member Author

Choose a reason for hiding this comment

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

In that case we shoudl fix the docs: https://docs.conda.io/projects/conda-build/en/latest/resources/activate-scripts.html

I don't really think that there is a high likelyhood it would fail because e.g. out of space for copying these small files.

Copy link
Member

Choose a reason for hiding this comment

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

Yeah agreed, the docs should be updated

@scopatz
Copy link
Member

scopatz commented Oct 8, 2020

Couple of small comments! Thanks wolf!

…a-build 3.19.2, conda-smithy 3.7.10, and conda-forge-pinning 2020.09.19.20.20.14
@wolfv
Copy link
Member Author

wolfv commented Oct 8, 2020

fixed all comments

@wolfv
Copy link
Member Author

wolfv commented Oct 8, 2020

@scopatz wanna merge? I could use the windows build in another feedstock

# Windows case
if [[ $dir != "${CONDA_PREFIX}/Library/share/rubygems/bin" ]]; then
PATH="${PATH:+$PATH:}$dir"
fi
Copy link
Member

Choose a reason for hiding this comment

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

The logic doesn't seem right here. Won't this add each $dir twice to the path if it isn't one of the disallowed paths and once if it is disallowed?

@scopatz
Copy link
Member

scopatz commented Oct 8, 2020

Yeah, I'll merge as soon as the deactivate logic is worked out 😉

@Tobias-Fischer
Copy link
Contributor

Hi @scopatz @wolfv,
What is the status of this PR? It would be great to see this merged. It would e.g. enable sdformat builds conda-forge/libsdformat-feedstock#9 which in turn would allow gazebo 11.2 builds .. :)

/cc @traversaro

@wolfv
Copy link
Member Author

wolfv commented Oct 30, 2020

@scopatz this should be good to go now, for real :)

@scopatz scopatz merged commit c4b1a32 into conda-forge:master Oct 30, 2020
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.

5 participants