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

fix build branch name #208

Merged
merged 2 commits into from
May 26, 2023
Merged

Conversation

mingshl
Copy link
Collaborator

@mingshl mingshl commented May 26, 2023

Description

fix build branch name

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: Mingshi Liu <[email protected]>
@mingshl mingshl force-pushed the fix-build-workflow branch from be9698d to 0d7c713 Compare May 26, 2023 18:19
@codecov
Copy link

codecov bot commented May 26, 2023

Codecov Report

Merging #208 (53a03ed) into main (bde3f40) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##             main     #208   +/-   ##
=======================================
  Coverage   86.27%   86.27%           
=======================================
  Files          15       15           
  Lines         204      204           
  Branches       40       40           
=======================================
  Hits          176      176           
  Misses         26       26           
  Partials        2        2           
Flag Coverage Δ
dashboards-search-relevance 86.27% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

@mingshl mingshl force-pushed the fix-build-workflow branch 2 times, most recently from ac983f6 to 5cca330 Compare May 26, 2023 19:13
@mingshl mingshl force-pushed the fix-build-workflow branch from 5cca330 to 53a03ed Compare May 26, 2023 19:15
elif [[ "${{ github.event_name }}" == "pull_request" ]]; then
echo "Base branch name is "${{ github.event.pull_request.base.ref }}""
BRANCH_NAME="${{ github.event.pull_request.base.ref }}"
fi
fi
Copy link
Collaborator

Choose a reason for hiding this comment

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

nit: extra space

Copy link
Collaborator

@noCharger noCharger left a comment

Choose a reason for hiding this comment

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

Approved with nit.

@noCharger noCharger merged commit 3b58246 into opensearch-project:main May 26, 2023
@github-actions
Copy link

The backport to 2.x failed:

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

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-208-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 3b58246eae39af426fcd9aa03182409be05bcd15
# Push it to GitHub
git push --set-upstream origin backport-208-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 base branch is 2.x and the compare/head branch is backport-208-to-2.x.

@github-actions
Copy link

The backport to 2.8 failed:

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

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

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

noCharger pushed a commit that referenced this pull request May 26, 2023
* fix build branch name

Signed-off-by: Mingshi Liu <[email protected]>

* test workflow with new pushes

Signed-off-by: Mingshi Liu <[email protected]>

---------

Signed-off-by: Mingshi Liu <[email protected]>
(cherry picked from commit 3b58246)
@github-actions
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:

# 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-208-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 3b58246eae39af426fcd9aa03182409be05bcd15
# Push it to GitHub
git push --set-upstream origin backport-208-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 base branch is 2.x and the compare/head branch is backport-208-to-2.x.

noCharger pushed a commit that referenced this pull request May 26, 2023
* fix build branch name

Signed-off-by: Mingshi Liu <[email protected]>

* test workflow with new pushes

Signed-off-by: Mingshi Liu <[email protected]>

---------

Signed-off-by: Mingshi Liu <[email protected]>
Signed-off-by: Mingshi Liu <[email protected]>
(cherry picked from commit 3b58246)
noCharger added a commit that referenced this pull request May 26, 2023
* fix build branch name

Signed-off-by: Mingshi Liu <[email protected]>

* test workflow with new pushes

Signed-off-by: Mingshi Liu <[email protected]>

---------

Signed-off-by: Mingshi Liu <[email protected]>
Signed-off-by: Mingshi Liu <[email protected]>
(cherry picked from commit 3b58246)

Co-authored-by: Mingshi Liu <[email protected]>
noCharger pushed a commit that referenced this pull request May 30, 2023
* fix build branch name

Signed-off-by: Mingshi Liu <[email protected]>

* test workflow with new pushes

Signed-off-by: Mingshi Liu <[email protected]>

---------

Signed-off-by: Mingshi Liu <[email protected]>
(cherry picked from commit 3b58246)
noCharger pushed a commit that referenced this pull request May 30, 2023
* fix build branch name

Signed-off-by: Mingshi Liu <[email protected]>

* test workflow with new pushes

Signed-off-by: Mingshi Liu <[email protected]>

---------

Signed-off-by: Mingshi Liu <[email protected]>
Signed-off-by: Mingshi Liu <[email protected]>
(cherry picked from commit 3b58246)
noCharger added a commit that referenced this pull request May 30, 2023
* fix build branch name

Signed-off-by: Mingshi Liu <[email protected]>

* test workflow with new pushes

Signed-off-by: Mingshi Liu <[email protected]>

---------

Signed-off-by: Mingshi Liu <[email protected]>
Signed-off-by: Mingshi Liu <[email protected]>
(cherry picked from commit 3b58246)

Co-authored-by: Mingshi Liu <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

2 participants