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] Add workflow to check compatibility #9074

Merged
merged 1 commit into from
Aug 2, 2023

Conversation

opensearch-trigger-bot[bot]
Copy link
Contributor

Backport 85f918e from #8486.

Signed-off-by: Sayali Gaikawad <[email protected]>
(cherry picked from commit 85f918e)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@codecov
Copy link

codecov bot commented Aug 2, 2023

Codecov Report

Merging #9074 (2a36a15) into 2.x (335b977) will decrease coverage by 0.02%.
The diff coverage is 0.00%.

@@             Coverage Diff              @@
##                2.x    #9074      +/-   ##
============================================
- Coverage     70.81%   70.80%   -0.02%     
+ Complexity    57441    57385      -56     
============================================
  Files          4749     4749              
  Lines        271395   271399       +4     
  Branches      40055    40055              
============================================
- Hits         192201   192151      -50     
+ Misses        62767    62734      -33     
- Partials      16427    16514      +87     
Files Changed Coverage Δ
...rg/opensearch/gradle/CheckCompatibilityTask.groovy 0.00% <0.00%> (ø)

... and 457 files with indirect coverage changes

@github-actions
Copy link
Contributor

github-actions bot commented Aug 2, 2023

Gradle Check (Jenkins) Run Completed with:

@kotwanikunal kotwanikunal merged commit 21723f0 into 2.x Aug 2, 2023
@github-actions github-actions bot deleted the backport/backport-8486-to-2.x branch August 2, 2023 18:53
@reta reta added the backport 2.x Backport to 2.x branch label Aug 2, 2023
@opensearch-trigger-bot
Copy link
Contributor Author

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/backport-9074-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 21723f097f643a89b81586df3e38e5920d294322
# Push it to GitHub
git push --set-upstream origin backport/backport-9074-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/backport-9074-to-2.x.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x Backport to 2.x branch skip-changelog
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants