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

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

Merged

Conversation

peterzhuamazon
Copy link
Member

@peterzhuamazon peterzhuamazon commented Nov 15, 2024

Description

Enable custom start commands and options to resolve GHA issues

Related Issues

Closes #666 #673
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 peterzhuamazon added enhancement New feature or request infrastructure Changes to infrastructure, testing, CI/CD, pipelines, etc. labels Nov 15, 2024
@peterzhuamazon peterzhuamazon self-assigned this Nov 15, 2024
Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
@peterzhuamazon
Copy link
Member Author

Hi @finnegancarroll @cwperks please take a look on this.

Thanks.

@amitgalitz
Copy link
Member

Should we also update actions/setup-java to v4?

@peterzhuamazon
Copy link
Member Author

Should we also update actions/setup-java to v4?

This particular PR is just to update previously failed and unsupported upload artifact actions.
And yes you can definitely raise another PR for updating all actions if needed.

Thanks.

@amitgalitz
Copy link
Member

Should we also update actions/setup-java to v4?

This particular PR is just to update previously failed and unsupported upload artifact actions. And yes you can definitely raise another PR for updating all actions if needed.

Thanks.

Sounds good, just mentioned cause I think I faced some node issue for the setup-java upgrades. Not a maintainer on this repo but updating on a different PR sounds good

Copy link
Member

@cwperks cwperks left a comment

Choose a reason for hiding this comment

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

Thank you @peterzhuamazon! This PR looks good to me. I'm not a maintainer of this repo so a maintainer should also have a look.

@@ -30,16 +30,11 @@ jobs:
# this image tag is subject to change as more dependencies and updates will arrive over time
image: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-version-linux }}
# need to switch to root so that github actions can install runner binary on container without permission issues.
Copy link
Member

@cwperks cwperks Nov 16, 2024

Choose a reason for hiding this comment

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

nit: remove this comment since the line below it is getting removed in this PR

@finnegancarroll finnegancarroll merged commit 8caf59c into opensearch-project:main Nov 18, 2024
10 checks passed
@opensearch-trigger-bot
Copy link

The backport to 1.3 failed:

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

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/asynchronous-search/backport-1.3 1.3
# Navigate to the new working tree
pushd ../.worktrees/asynchronous-search/backport-1.3
# Create a new branch
git switch --create backport/backport-676-to-1.3
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 8caf59ca49a3fa8c80cf05b1877b29bf32afd8b2
# Push it to GitHub
git push --set-upstream origin backport/backport-676-to-1.3
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/asynchronous-search/backport-1.3

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

@opensearch-trigger-bot
Copy link

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:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/asynchronous-search/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/asynchronous-search/backport-2.x
# Create a new branch
git switch --create backport/backport-676-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 8caf59ca49a3fa8c80cf05b1877b29bf32afd8b2
# Push it to GitHub
git push --set-upstream origin backport/backport-676-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/asynchronous-search/backport-2.x

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

finnegancarroll pushed a commit to finnegancarroll/asynchronous-search that referenced this pull request Nov 18, 2024
…earch-project#676)

* Enable custom start commands and options to resolve GHA issues

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Enable custom start commands and options to resolve GHA issues

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Enable custom start commands and options to resolve GHA issues

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

---------

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
(cherry picked from commit 8caf59c)
peterzhuamazon added a commit that referenced this pull request Nov 18, 2024
…#678)

* Enable custom start commands and options to resolve GHA issues

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Enable custom start commands and options to resolve GHA issues

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Enable custom start commands and options to resolve GHA issues

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

---------

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

Co-authored-by: Peter Zhu <zhujiaxi@amazon.com>
@peterzhuamazon peterzhuamazon deleted the update-nodejs-compat branch November 18, 2024 18:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 1.3 backport 2.x backport to 2.x backport-failed enhancement New feature or request infrastructure Changes to infrastructure, testing, CI/CD, pipelines, etc.
Projects
Status: ✅ Done
Development

Successfully merging this pull request may close these issues.

Github Action Deprecation: actions/upload-artifact@v3
4 participants