-
Notifications
You must be signed in to change notification settings - Fork 892
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
OSD-2847 bump del version to fix race condition #2873
OSD-2847 bump del version to fix race condition #2873
Conversation
Signed-off-by: Daniel Belmes <3631206+DanielBelmes@users.noreply.github.com>
Signed-off-by: Daniel Belmes <3631206+DanielBelmes@users.noreply.github.com>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@DanielBelmes thanks for the fix! Do you mind updating the CHANGELOG entry to specify the "why"?
@@ -161,7 +161,7 @@ | |||
"commander": "^3.0.2", | |||
"core-js": "^3.6.5", | |||
"deep-freeze-strict": "^1.1.1", | |||
"del": "^5.1.0", | |||
"del": "^6.1.1", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Although this is a major version bump of a direct dependency, it should be safe to backport, because the only breaking change in v6 is requiring Node.js
10. Our 1.x
branch is already on Node.js 10.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we know if other plugins use del
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why would that matter - none of them can specify a node engine < 10, right?
Co-authored-by: Josh Romero <rmerqg@amazon.com> Signed-off-by: DanielBelmes <3631206+DanielBelmes@users.noreply.github.com>
Codecov Report
@@ Coverage Diff @@
## main #2873 +/- ##
==========================================
- Coverage 66.68% 66.67% -0.01%
==========================================
Files 3219 3219
Lines 61445 61445
Branches 9417 9417
==========================================
- Hits 40972 40968 -4
- Misses 18228 18231 +3
- Partials 2245 2246 +1
Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. |
The backport to
To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/backport-1.x 1.x
# Navigate to the new working tree
pushd ../.worktrees/backport-1.x
# Create a new branch
git switch --create backport/backport-2873-to-1.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 9041a8278739e2979cdf6b2307629f3f3b802dcd
# Push it to GitHub
git push --set-upstream origin backport/backport-2873-to-1.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/backport-1.x Then, create a pull request where the |
The backport to
To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-2873-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 9041a8278739e2979cdf6b2307629f3f3b802dcd
# Push it to GitHub
git push --set-upstream origin backport/backport-2873-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/backport-2.x Then, create a pull request where the |
) * OSD-2847 bump del version to fix race condition Signed-off-by: Daniel Belmes <3631206+DanielBelmes@users.noreply.github.com> (cherry picked from commit 9041a82)
* OSD-2847 bump del version to fix race condition Signed-off-by: Daniel Belmes <3631206+DanielBelmes@users.noreply.github.com> (cherry picked from commit 9041a82) Co-authored-by: Daniel Belmes <3631206+DanielBelmes@users.noreply.github.com>
) * OSD-2847 bump del version to fix race condition Signed-off-by: Daniel Belmes <3631206+DanielBelmes@users.noreply.github.com> (cherry picked from commit 9041a82)
) * OSD-2847 bump del version to fix race condition Signed-off-by: Daniel Belmes <3631206+DanielBelmes@users.noreply.github.com> (cherry picked from commit 9041a82)
* OSD-2847 bump del version to fix race condition Signed-off-by: Daniel Belmes <3631206+DanielBelmes@users.noreply.github.com> (cherry picked from commit 9041a82) Co-authored-by: Daniel Belmes <3631206+DanielBelmes@users.noreply.github.com>
* OSD-2847 bump del version to fix race condition Signed-off-by: Daniel Belmes <3631206+DanielBelmes@users.noreply.github.com> (cherry picked from commit 9041a82) Co-authored-by: Daniel Belmes <3631206+DanielBelmes@users.noreply.github.com> (cherry picked from commit 7c9cba1) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
…ix race condition (#2873) (#2979) * OSD-2847 bump del version to fix race condition (#2873) (#2971) * OSD-2847 bump del version to fix race condition Signed-off-by: Daniel Belmes <3631206+DanielBelmes@users.noreply.github.com> (cherry picked from commit 9041a82) Co-authored-by: Daniel Belmes <3631206+DanielBelmes@users.noreply.github.com> (cherry picked from commit 7c9cba1) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> * [Chore] update changelog Signed-off-by: Josh Romero <rmerqg@amazon.com> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Signed-off-by: Josh Romero <rmerqg@amazon.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: Daniel Belmes <3631206+DanielBelmes@users.noreply.github.com> Co-authored-by: Josh Romero <rmerqg@amazon.com>
Description
There is a Mac OS only race condition within the del library. This causes failures when
info [ opensearch-dashboards ] Cleaning all empty folders recursively
is running and causes the build to fail.(Tries to delete an already deleted folder) Version 6.1.1 is the latest version of del that requires 0 implementation changes on our end. Just need to update the package.Issues Resolved
[OSD-2847]
Check List
yarn test:jest
yarn test:jest_integration
yarn test:ftr