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

deps: update simdjson to 3.11.6 #56663

Open
wants to merge 4 commits into
base: main
Choose a base branch
from

Conversation

lemire
Copy link
Member

@lemire lemire commented Jan 20, 2025

I pulled the automated update branch #56250 and I ran the manual update script ./dep_updaters/update-simdjson.sh after disabling this code so that it will still run despite being at the version 3.11.6 already:

if [ "$NEW_VERSION" = "$CURRENT_VERSION" ]; then
  echo "Skipped because simdjson is on the latest version."
  exit 0
fi

Doing so should not change anything: if you update to the current version, you should simply redownload the same files.

I get this pull request. Observe how the result differs: it should not differ.

@nodejs-github-bot
Copy link
Collaborator

Review requested:

  • @nodejs/security-wg

@nodejs-github-bot nodejs-github-bot added dependencies Pull requests that update a dependency file. needs-ci PRs that need a full CI run. labels Jan 20, 2025
@lemire lemire requested a review from anonrig January 20, 2025 01:46
@anonrig anonrig added the request-ci Add this label to start a Jenkins CI on a PR. label Jan 20, 2025
@lemire lemire added author ready PRs that have at least one approval, no pending requests for changes, and a CI started. commit-queue Add this label to land a pull request using GitHub Actions. labels Jan 20, 2025
@anonrig anonrig added the commit-queue-rebase Add this label to allow the Commit Queue to land a PR in several commits. label Jan 20, 2025
@mhdawson
Copy link
Member

@lemire do you think the differences are adding in this PR mean the updater is not working correctly ?

@targos
Copy link
Member

targos commented Jan 20, 2025

It's not the first time I see weird behavior of accumulated updates in the same PR. I would recommend to change the workflows to use peter-evans/create-pull-request, as I did for V8 patch updates.

@lemire
Copy link
Member Author

lemire commented Jan 21, 2025

@mhdawson

I did not investigate the issue further but I am quite confident that issue is not upstream (in simdjson).

The way the updater works is that it pulls in release zip files. This should be fine. Yet, somehow, we end up with the wrong file !!!

Well. Not exactly. Both files have this line in it...

#define SIMDJSON_VERSION "3.11.6"

So we are pulling the right version.

Strangely, we copy two files (.h and .cpp) but only the .h seems broken.

@lemire
Copy link
Member Author

lemire commented Jan 21, 2025

The script is not exactly mysterious, this should work.

echo "Fetching simdjson source archive..."
curl -sL -o "$SIMDJSON_ZIP" "https://github.com/simdjson/simdjson/archive/refs/tags/$SIMDJSON_REF.zip"
unzip "$SIMDJSON_ZIP"
cd "simdjson-$NEW_VERSION"
mv "singleheader/simdjson.h" "$DEPS_DIR/simdjson"
mv "singleheader/simdjson.cpp" "$DEPS_DIR/simdjson"
mv "LICENSE" "$DEPS_DIR/simdjson"

@github-actions github-actions bot removed the request-ci Add this label to start a Jenkins CI on a PR. label Jan 21, 2025
@lemire
Copy link
Member Author

lemire commented Jan 21, 2025

@targos please see #56684

@nodejs-github-bot
Copy link
Collaborator

@aduh95
Copy link
Contributor

aduh95 commented Jan 22, 2025

Could we close this PR, and fix the automation instead? If we land this in several commits, it means 8c0e4cb will be on main, which doesn't build, making bisecting needlessly harder. It would be also more useful to validate the automation works correctly.

@lemire
Copy link
Member Author

lemire commented Jan 22, 2025

If we land this in several commits, it means 8c0e4cb will be on main, which doesn't build, making bisecting needlessly harder. It would be also more useful to validate the automation works correctly.

I expected this PR to be squashed and merged. Isn't this so?

@aduh95
Copy link
Contributor

aduh95 commented Jan 22, 2025

By default, it would use the first commit's message – and therefor land a commit with the wrong version. However, because it has the commit-queue-rebase Add this label to allow the Commit Queue to land a PR in several commits. label, it will not squash this time. But anyway, we can land it manually, but my point on "we should validate that the automation is actually fixed" still stands – no strong feelings though, feel free to disagree.

@lemire
Copy link
Member Author

lemire commented Jan 22, 2025

@aduh95

By default, it would use the first commit's message – and therefor land a commit with the wrong version. However, because it has the commit-queue-rebase label, it will not squash this time. But anyway, we can land it manually, but my point on "we should validate that the automation is actually fixed" still stands – no strong feelings though, feel free to disagree.

For a month, the automated update has been pushing broken code:

#56250

I have contributed something that might fix the updates:

#56684

If you ask me, I will just close this issue (the one we are on). Is that what you recommend?

@aduh95
Copy link
Contributor

aduh95 commented Jan 22, 2025

Is that what you recommend?

Yes exactly, good to hear we do align (sorry if I wasn't clear, written communication is hard sometimes :D)

@jasnell
Copy link
Member

jasnell commented Jan 22, 2025

Given the discussion it's not clear if this PR is actually ready to move forward. I'm going to remove the author ready and commit-queue labels here just in case. If this is ready to land, please just follow up with a comment making that clear.

@jasnell jasnell removed the author ready PRs that have at least one approval, no pending requests for changes, and a CI started. label Jan 22, 2025
@jasnell jasnell added request-ci Add this label to start a Jenkins CI on a PR. and removed commit-queue Add this label to land a pull request using GitHub Actions. commit-queue-rebase Add this label to allow the Commit Queue to land a PR in several commits. labels Jan 22, 2025
@github-actions github-actions bot removed the request-ci Add this label to start a Jenkins CI on a PR. label Jan 22, 2025
@nodejs-github-bot

This comment was marked as outdated.

@nodejs-github-bot

This comment was marked as outdated.

@nodejs-github-bot
Copy link
Collaborator

@targos
Copy link
Member

targos commented Jan 28, 2025

#56250 auto-update looks good

@nodejs-github-bot
Copy link
Collaborator

Copy link
Member

@targos targos left a comment

Choose a reason for hiding this comment

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

automated PR is fixed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dependencies Pull requests that update a dependency file. needs-ci PRs that need a full CI run.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants