WIP: Sync AnacondaRecipes

conda-forge / zstd-feedstock

A conda-smithy repository for zstd.

BSD 3-Clause "New" or "Revised" License

2 stars 26 forks source link

WIP: Sync AnacondaRecipes #33

Closed jakirkham closed 4 years ago

jakirkham commented 4 years ago

Checklist

[ ] Used a 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 code>@<space/conda-forge-admin, please rerender in a comment in this PR for automated rerendering)
[ ] Ensured the license file is being packaged.

conda-forge-linter commented 4 years ago

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

I was trying to look for recipes to lint for you, but it appears we have a merge conflict. Please try to merge or rebase with the base branch to resolve this conflict.

Please ping the 'conda-forge/core' team (using the @ notation in a comment) if you believe this is a bug.

jakirkham commented 4 years ago

cc @mingwandroid

jakirkham commented 4 years ago

@conda-forge-admin, please re-render.

conda-forge-linter commented 4 years ago

Hi! This is the friendly automated conda-forge-webservice.

I tried to re-render for you, but it looks like I wasn't able to push to the sync_anaconda branch of jakirkham-feedstocks/zstd-feedstock. Did you check the "Allow edits from maintainers" box?

jakirkham commented 4 years ago

@conda-forge-admin, please re-render.

conda-forge-linter commented 4 years ago

Hi! This is the friendly automated conda-forge-webservice.

I tried to re-render for you, but it looks like I wasn't able to push to the sync_anaconda branch of jakirkham-feedstocks/zstd-feedstock. Did you check the "Allow edits from maintainers" box?

jakirkham commented 4 years ago

Yeah it’s also pretty confused especially since both branches use CMake, but it makes it look like that is not the case.

jakirkham commented 4 years ago

FTR the diff only looks weird on GitHub. I'm not seeing these issues with Git.

jakirkham commented 4 years ago

Can you rebase on master?

That's probably not easy. It's probably more straightforward to fix the merge conflicts. I'll try to work on this.

The diff looks very weird and thus I feel unsafe with merging these changes.

Agreed. I don't think it should be merged until we sort out the merge conflicts. I'm hopeful GitHub will regain its sense then. 🙂

wolfv commented 4 years ago

Is this PR superseded?

xhochy commented 4 years ago

This is quite outdated again.