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

[Backport 2.x] Temp use of older nodejs version before moving to Almalinux8 #2628

Merged
merged 1 commit into from
Jul 9, 2024

Conversation

peterzhuamazon
Copy link
Member

Description

[Backport 2.x] Temp use of older nodejs version before moving to Almalinux8

Issues Resolved

Backport #2627

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

…linux8

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
@ylwu-amzn ylwu-amzn merged commit 3902faa into opensearch-project:2.x Jul 9, 2024
11 of 14 checks passed
opensearch-trigger-bot bot pushed a commit that referenced this pull request Jul 9, 2024
…linux8 (#2628)

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
(cherry picked from commit 3902faa)
dhrubo-os pushed a commit that referenced this pull request Jul 9, 2024
…linux8 (#2628) (#2629)

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
(cherry picked from commit 3902faa)

Co-authored-by: Peter Zhu <zhujiaxi@amazon.com>
@peterzhuamazon peterzhuamazon deleted the backport-2627 branch July 17, 2024 17:04
opensearch-trigger-bot bot pushed a commit that referenced this pull request Jul 17, 2024
…linux8 (#2628)

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
(cherry picked from commit 3902faa)
opensearch-trigger-bot bot pushed a commit that referenced this pull request Jul 17, 2024
…linux8 (#2628)

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
(cherry picked from commit 3902faa)
opensearch-trigger-bot bot pushed a commit that referenced this pull request Jul 17, 2024
…linux8 (#2628)

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
(cherry picked from commit 3902faa)
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.13 failed:

The process '/usr/bin/git' failed with exit code 1

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.13 2.13
# Navigate to the new working tree
cd .worktrees/backport-2.13
# Create a new branch
git switch --create backport/backport-2628-to-2.13
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 3902faa77922125ffa586180a9a3bfa500ac7908
# Push it to GitHub
git push --set-upstream origin backport/backport-2628-to-2.13
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.13

Then, create a pull request where the base branch is 2.13 and the compare/head branch is backport/backport-2628-to-2.13.

Zhangxunmt pushed a commit that referenced this pull request Jul 18, 2024
…linux8 (#2628) (#2663)

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
(cherry picked from commit 3902faa)

Co-authored-by: Peter Zhu <zhujiaxi@amazon.com>
Zhangxunmt pushed a commit that referenced this pull request Jul 18, 2024
…linux8 (#2628) (#2664)

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
(cherry picked from commit 3902faa)

Co-authored-by: Peter Zhu <zhujiaxi@amazon.com>
Zhangxunmt pushed a commit that referenced this pull request Jul 18, 2024
…linux8 (#2628) (#2665)

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
(cherry picked from commit 3902faa)

Co-authored-by: Peter Zhu <zhujiaxi@amazon.com>
@b4sjoo b4sjoo added v2.16.0 Issues targeting release v2.16.0 and removed v2.16.0 Issues targeting release v2.16.0 labels Jul 26, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: ✅ Done
Development

Successfully merging this pull request may close these issues.

4 participants