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

[bot-automerge] zstd v1.5.1 #56

Merged
merged 6 commits into from
Dec 27, 2021

Conversation

regro-cf-autotick-bot
Copy link
Contributor

It is very likely that the current package version for this feedstock is out of date.
Notes for merging this PR:

  1. Feel free to push to the bot's branch to update this PR if needed.
  2. The bot will almost always only open one PR per version.
    Checklist before merging this PR:
  • Dependencies have been updated if changed: see upstream
  • Tests have passed
  • Updated license if changed and license_file is packaged

Note that the bot will stop issuing PRs if more than 3 Version bump PRs generated by the bot are open. If you don't want to package a particular version please close the PR.

NEW: If you want these PRs to be merged automatically, make an issue with @conda-forge-admin,please add bot automerge in the title and merge the resulting PR. This command will add our new bot automerge feature to your feedstock!

If this PR was opened in error or needs to be updated please add the bot-rerun label to this PR. The bot will close this PR and schedule another one. If you do not have permissions to add this label, you can use the phrase @conda-forge-admin, please rerun bot in a PR comment to have the conda-forge-admin add it for you.

This PR was created by the regro-cf-autotick-bot.
The regro-cf-autotick-bot is a service to automatically track the dependency graph, migrate packages, and propose package version updates for conda-forge. If you would like a local version of this bot, you might consider using rever. Rever is a tool for automating software releases and forms the backbone of the bot's conda-forge PRing capability. Rever is both conda (conda install -c conda-forge rever) and pip (pip install re-ver) installable.
Finally, feel free to drop us a line if there are any issues!
This PR was generated by https://github.com/regro/autotick-bot/actions/runs/1604984435, please use this URL for debugging

Here is a list of all the pending dependencies (and their versions) for this repo. Please double check all dependencies before merging.

Name Upstream Version Current Version
zstd 1.5.1 Anaconda-Server Badge

Dependency Analysis

Please note that this analysis is highly experimental. The aim here is to make maintenance easier by inspecting the package's dependencies. Importantly this analysis does not support optional dependencies, please double check those before making changes. If you do not want hinting of this kind ever please add bot: inspection: false to your conda-forge.yml. If you encounter issues with this feature please ping the bot team conda-forge/bot.

Analysis of the source code shows no discrepancy between the library's imports and the package's stated requirements in the meta.yaml.

@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.

@github-actions
Copy link
Contributor

Hi! This is the friendly conda-forge automerge bot!

I considered the following status checks when analyzing this PR:

  • linter: passed
  • travis: passed
  • azure: failed

Thus the PR was not passing and not merged.

@ghost
Copy link

ghost commented Dec 24, 2021

zstd v1.5.1 has a x86_64 assembly file for Linux/macOS.
\lib\decompress\huf_decompress_amd64.S

On Windows, this file is not excluded, resulting in compilation failure.

This patch should fix the Windows build.
facebook/zstd#2951

@hmaarrfk
Copy link
Contributor

if you update the PR with the patch, and cross reference your PR in the meta file, then we can merge.

@ghost
Copy link

ghost commented Dec 25, 2021

if you update the PR with the patch, and cross reference your PR in the meta file, then we can merge.

This is new to me, it may take a long time to do well.
Please arrange another person to do it.

@hmaarrfk
Copy link
Contributor

understood. thanks for your help and the cross reference

@github-actions
Copy link
Contributor

Hi! This is the friendly conda-forge automerge bot!

It appears that not all commits to this PR were made by the bot. Thus this PR is not being automatically merged. Please add the automerge label again (or ask a maintainer to do so) if you'd like to enable automerge again!

@hmaarrfk hmaarrfk added the automerge Merge the PR when CI passes label Dec 27, 2021
@hmaarrfk
Copy link
Contributor

It seems like the patch didn't fully resolve things. Any ideas?

@ghost
Copy link

ghost commented Dec 27, 2021

zstd/build/cmake/lib/CMakeLists.txt also has .S file.

file(GLOB CommonSources ${LIBRARY_DIR}/common/*.c)
file(GLOB CompressSources ${LIBRARY_DIR}/compress/*.c)
file(GLOB DecompressSources ${LIBRARY_DIR}/decompress/*.c ${LIBRARY_DIR}/decompress/*.S)
file(GLOB DictBuilderSources ${LIBRARY_DIR}/dictBuilder/*.c)

Look at the error log, mayby also need to be modify zstd/build/cmake/lib/CMakeLists.txt

...
LINK : fatal error LNK1181: cannot open input file 'lib\CMakeFiles\libzstd_shared.dir\D_\bld\zstd-split_1640579743323\work\lib\decompress\huf_decompress_amd64.S.obj'
[40/75] Building C object lib\CMakeFiles\libzstd_static.dir\D_\bld\zstd-split_1640579743323\work\lib\common\pool.c.obj
...

@ghost
Copy link

ghost commented Dec 27, 2021

I don't know much about meson.
Try this patch:

 build/cmake/lib/CMakeLists.txt | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/build/cmake/lib/CMakeLists.txt b/build/cmake/lib/CMakeLists.txt
index ec8480d5..612f667f 100644
--- a/build/cmake/lib/CMakeLists.txt
+++ b/build/cmake/lib/CMakeLists.txt
@@ -22,7 +22,11 @@ include_directories(${LIBRARY_DIR} ${LIBRARY_DIR}/common)
 
 file(GLOB CommonSources ${LIBRARY_DIR}/common/*.c)
 file(GLOB CompressSources ${LIBRARY_DIR}/compress/*.c)
-file(GLOB DecompressSources ${LIBRARY_DIR}/decompress/*.c ${LIBRARY_DIR}/decompress/*.S)
+if (MSVC)
+    file(GLOB DecompressSources ${LIBRARY_DIR}/decompress/*.c)
+else ()
+    file(GLOB DecompressSources ${LIBRARY_DIR}/decompress/*.c ${LIBRARY_DIR}/decompress/*.S)
+endif ()
 file(GLOB DictBuilderSources ${LIBRARY_DIR}/dictBuilder/*.c)
 
 set(Sources

@hmaarrfk
Copy link
Contributor

You might be right, it seems to be using cmake not meson.

@github-actions
Copy link
Contributor

Hi! This is the friendly conda-forge automerge bot!

Commits were made to this PR after the automerge label was added. For security reasons, I have disabled automerge by removing the automerge label. Please add the automerge label again (or ask a maintainer to do so) if you'd like to enable automerge again!

@github-actions github-actions bot removed the automerge Merge the PR when CI passes label Dec 27, 2021
@hmaarrfk
Copy link
Contributor

Thank you that seems to have done it!

@hmaarrfk
Copy link
Contributor

Did you want to make the patch upstream instead of me? I already submitted it but i'm happy to close my PR.

@hmaarrfk
Copy link
Contributor

@conda-forge-admin please restart cis

@ghost
Copy link

ghost commented Dec 27, 2021

No need to close the PR.
Glad to see it builds.

@hmaarrfk
Copy link
Contributor

Hmm azure seems to be down.

@ghost
Copy link

ghost commented Dec 27, 2021

Where is azure? I see they are green, Travis CI and conda-forge-linter.

@hmaarrfk
Copy link
Contributor

@conda-forge-admin please restart cis

That is the thing. There should be azure builds...

@hmaarrfk
Copy link
Contributor

@conda-forge-admin please rerender

@github-actions
Copy link
Contributor

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

I tried to rerender for you, but it looks like there was nothing to do.

This message was generated by GitHub actions workflow run https://github.com/conda-forge/zstd-feedstock/actions/runs/1626295821.

@hmaarrfk hmaarrfk merged commit 100871b into conda-forge:master Dec 27, 2021
@regro-cf-autotick-bot regro-cf-autotick-bot deleted the 1.5.1_h7917de branch December 27, 2021 12:32
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.

3 participants