Skip to content

Enable custom start commands and options to resolve GHA issues#3223

Merged
peterzhuamazon merged 1 commit intoopensearch-project:mainfrom
peterzhuamazon:update-nodejs-compat
Nov 15, 2024
Merged

Enable custom start commands and options to resolve GHA issues#3223
peterzhuamazon merged 1 commit intoopensearch-project:mainfrom
peterzhuamazon:update-nodejs-compat

Conversation

@peterzhuamazon
Copy link
Copy Markdown
Member

Description

Enable custom start commands and options to resolve GHA issues

Related Issues

opensearch-project/opensearch-build#5178

Check List

  • [ ] New functionality includes testing.
  • [ ] New functionality has been documented.
  • [ ] API changes companion pull request created.
  • Commits are signed per the DCO using --signoff.
  • [ ] Public documentation issue/PR created.

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.

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
@peterzhuamazon
Copy link
Copy Markdown
Member Author

Hi @ylwu-amzn @dhrubo-os this will only take effect after merging.

Thanks!

@dhrubo-os
Copy link
Copy Markdown
Collaborator

Hi @ylwu-amzn @dhrubo-os this will only take effect after merging.

Thanks!

Approved. Thanks for looking into this.

@peterzhuamazon peterzhuamazon merged commit 9c1b8a8 into opensearch-project:main Nov 15, 2024
@peterzhuamazon peterzhuamazon deleted the update-nodejs-compat branch November 15, 2024 21:18
@opensearch-trigger-bot
Copy link
Copy Markdown
Contributor

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

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

@opensearch-trigger-bot
Copy link
Copy Markdown
Contributor

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

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-3223-to-2.x.

peterzhuamazon added a commit to peterzhuamazon/ml-commons that referenced this pull request Nov 15, 2024
peterzhuamazon added a commit that referenced this pull request Nov 15, 2024
@peterzhuamazon peterzhuamazon mentioned this pull request Dec 3, 2024
5 tasks
opensearch-trigger-bot bot pushed a commit that referenced this pull request Jan 7, 2025
#3224)

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
(cherry picked from commit ef931d5)
pyek-bot pushed a commit to pyek-bot/ml-commons that referenced this pull request Jan 7, 2025
b4sjoo pushed a commit that referenced this pull request Jan 7, 2025
#3224) (#3341)

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
Co-authored-by: Peter Zhu <zhujiaxi@amazon.com>
opensearch-trigger-bot bot pushed a commit that referenced this pull request Jan 7, 2025
#3224) (#3341)

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
Co-authored-by: Peter Zhu <zhujiaxi@amazon.com>
(cherry picked from commit 65254c3)
opensearch-trigger-bot bot pushed a commit that referenced this pull request Jan 7, 2025
#3224) (#3341)

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
Co-authored-by: Peter Zhu <zhujiaxi@amazon.com>
(cherry picked from commit 65254c3)
opensearch-trigger-bot bot pushed a commit that referenced this pull request Jan 7, 2025
#3224) (#3341)

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
Co-authored-by: Peter Zhu <zhujiaxi@amazon.com>
(cherry picked from commit 65254c3)
opensearch-trigger-bot bot pushed a commit that referenced this pull request Jan 7, 2025
#3224) (#3341)

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
Co-authored-by: Peter Zhu <zhujiaxi@amazon.com>
(cherry picked from commit 65254c3)
mingshl pushed a commit that referenced this pull request Jan 8, 2025
#3224) (#3341) (#3343)

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
Co-authored-by: Peter Zhu <zhujiaxi@amazon.com>
(cherry picked from commit 65254c3)

Co-authored-by: Pavan Yekbote <mail2pavanyekbote@gmail.com>
mingshl pushed a commit that referenced this pull request Jan 8, 2025
#3224) (#3341) (#3344)

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
Co-authored-by: Peter Zhu <zhujiaxi@amazon.com>
(cherry picked from commit 65254c3)

Co-authored-by: Pavan Yekbote <mail2pavanyekbote@gmail.com>
mingshl pushed a commit that referenced this pull request Jan 8, 2025
#3224) (#3341) (#3345)

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
Co-authored-by: Peter Zhu <zhujiaxi@amazon.com>
(cherry picked from commit 65254c3)

Co-authored-by: Pavan Yekbote <mail2pavanyekbote@gmail.com>
mingshl pushed a commit that referenced this pull request Jan 8, 2025
#3224) (#3341) (#3346)

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
Co-authored-by: Peter Zhu <zhujiaxi@amazon.com>
(cherry picked from commit 65254c3)

Co-authored-by: Pavan Yekbote <mail2pavanyekbote@gmail.com>
b4sjoo pushed a commit that referenced this pull request Jan 8, 2025
#3224) (#3340)

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

Co-authored-by: Peter Zhu <zhujiaxi@amazon.com>
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.

2 participants