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

Modify triggers to push snapshots on all branches #454

Merged
merged 1 commit into from
Jun 15, 2023

Conversation

gaiksaya
Copy link
Member

Description

Modify triggers to push snapshots on all branches. See history here: https://github.com/opensearch-project/common-utils/actions/workflows/maven-publish.yml
We had to manually trigger the workflow many times.

Issues Resolved

[List any issues this PR will resolve]

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.

@codecov
Copy link

codecov bot commented Jun 15, 2023

Codecov Report

Merging #454 (c840aa9) into main (4c6f497) will not change coverage.
The diff coverage is n/a.

@@            Coverage Diff            @@
##               main     #454   +/-   ##
=========================================
  Coverage     73.69%   73.69%           
  Complexity      804      804           
=========================================
  Files           125      125           
  Lines          5219     5219           
  Branches        662      662           
=========================================
  Hits           3846     3846           
  Misses         1087     1087           
  Partials        286      286           

@gaiksaya gaiksaya merged commit 1484bff into opensearch-project:main Jun 15, 2023
@gaiksaya gaiksaya deleted the triggers branch June 15, 2023 18:16
@opensearch-trigger-bot
Copy link
Contributor

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

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

@opensearch-trigger-bot
Copy link
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-454-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 1484bff81af8496c93e5f3e9634cb93c1f948750
# Push it to GitHub
git push --set-upstream origin backport/backport-454-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-454-to-2.x.

@opensearch-trigger-bot
Copy link
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-454-to-1.3
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 1484bff81af8496c93e5f3e9634cb93c1f948750
# Push it to GitHub
git push --set-upstream origin backport/backport-454-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-454-to-1.3.

@opensearch-trigger-bot
Copy link
Contributor

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

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

@Hailong-am
Copy link
Contributor

@gaiksaya backport PRs are failed, should we do manual backport?

@gaiksaya
Copy link
Member Author

gaiksaya commented Jul 5, 2023

@gaiksaya backport PRs are failed, should we do manual backport?

Yeah! You can follow above mentioned steps. Thanks!

Hailong-am pushed a commit to Hailong-am/common-utils that referenced this pull request Jul 7, 2023
Hailong-am pushed a commit to Hailong-am/common-utils that referenced this pull request Jul 7, 2023
…#454)

Signed-off-by: Sayali Gaikawad <[email protected]>
(cherry picked from commit 1484bff)
Signed-off-by: Hailong Cui <[email protected]>
AWSHurneyt pushed a commit that referenced this pull request Jul 10, 2023
(cherry picked from commit 1484bff)

Signed-off-by: Sayali Gaikawad <[email protected]>
Signed-off-by: Hailong Cui <[email protected]>
Co-authored-by: Sayali Gaikawad <[email protected]>
AWSHurneyt pushed a commit to AWSHurneyt/common-utils that referenced this pull request Apr 12, 2024
…#454) (opensearch-project#475)

(cherry picked from commit 1484bff)

Signed-off-by: Sayali Gaikawad <[email protected]>
Signed-off-by: Hailong Cui <[email protected]>
Co-authored-by: Sayali Gaikawad <[email protected]>
Signed-off-by: AWSHurneyt <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants