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

Remove temporary pr-4995.patch #99

Merged
merged 1 commit into from
May 29, 2024

Conversation

jdblischak
Copy link
Collaborator

Closes #98

Details in #98 (comment)

@jdblischak jdblischak self-assigned this May 29, 2024
Copy link
Member

@teo-tsirpanis teo-tsirpanis left a comment

Choose a reason for hiding this comment

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

That Core PR might be responsible for failures in MariaDB, but let's merge this for the feedstock nightlies.

@jdblischak
Copy link
Collaborator Author

Also, to demonstrate that this will fix the nightly builds, I manually deleted the patch in the nightly-build branch and pushed to my fork. The builds haven't completed yet, but they no longer fail at the early stage of applying the patches.

@jdblischak
Copy link
Collaborator Author

The builds haven't completed yet

Update: The linux-64 build completed successfully. However, the build is going to fail since it is unable to upload the binary to anaconda.org, since I didn't update my fork to handle this.

Copy link
Member

@ihnorton ihnorton left a comment

Choose a reason for hiding this comment

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

Thanks. It would be nice if we could use patch -N here, but I guess the call to patch is buried somewhere inside of conda-build.

@jdblischak jdblischak merged commit 2cd189f into TileDB-Inc:main May 29, 2024
@jdblischak jdblischak deleted the rm-pr-4995-patch branch May 29, 2024 16:02
@jdblischak
Copy link
Collaborator Author

Thanks. It would be nice if we could use patch -N here, but I guess the call to patch is buried somewhere inside of conda-build.

"buried" is definitely the correct term. I did a quick search of how they call patch from within conda-build, and they do all sorts of acrobats, mostly to avoid potential problems with different line endings. The Issue conda/conda-build#4054 describes some of the difficulties. And I think patch is actually executed by the function apply_one_patch() in source.py

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.

Nightly feedstock build failed
3 participants