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

Bulk to master: bioconda-utils 3.3.1 and OSX SDK vars #56

Merged
merged 21 commits into from
Jun 14, 2024
Merged

Conversation

aliciaaevans
Copy link
Contributor

@aliciaaevans aliciaaevans commented Jun 14, 2024

Bulk and master should be the same now, so I'm merging bulk directly in rather than copying the file changes.

johanneskoester and others added 21 commits May 21, 2023 19:57
Need this for ARM bulk CI to check for `linux-aarch64` in
`extra.additional-platforms`.
- Update bulk to match master
- Use new bioconda-utils version with updated pinnings

---------

Signed-off-by: Marcel Bargull <marcel.bargull@udo.edu>
Co-authored-by: Johannes Köster <johannes.koester@tu-dortmund.de>
Co-authored-by: Marcel Bargull <mbargull@users.noreply.github.com>
Co-authored-by: Marcel Bargull <marcel.bargull@udo.edu>
While these are specified in bioconda_utils'
bioconda_utils-conda_build_config.yaml, they do not make it out into
environment variables. Yet they are required for
`run_conda_forge_build_setup` to set the correct deployment target, so
we set them here.
@aliciaaevans aliciaaevans changed the title Bulk to master: bicoonda-utils 3.3.1 and OSX SDK vars Bulk to master: bioconda-utils 3.3.1 and OSX SDK vars Jun 14, 2024
@aliciaaevans aliciaaevans marked this pull request as ready for review June 14, 2024 18:10
@aliciaaevans
Copy link
Contributor Author

Since we discussed this on the core meeting, I'm going to go ahead and merge it. I want to get bulk merged ASAP before more conflicts come up.

@aliciaaevans aliciaaevans merged commit 1da537f into master Jun 14, 2024
2 checks passed
@aliciaaevans aliciaaevans deleted the bulk branch June 14, 2024 19:15
@aliciaaevans aliciaaevans restored the bulk branch June 14, 2024 20:26
@aliciaaevans
Copy link
Contributor Author

oops, deleted the bulk branch by mistake.

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