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

[Manual Backport 2.x][CI] Reduce redundancy by using matrix strategy on workflows (#3514) #3609

Merged
merged 1 commit into from
Mar 17, 2023

Conversation

kavilla
Copy link
Member

@kavilla kavilla commented Mar 14, 2023

Backport of 1e127b0 from #3514

@kavilla kavilla requested a review from a team as a code owner March 14, 2023 19:27
…rch-project#3514)

* ci: reduce redundancy by using matrix strategy on Windows and Linux workflows (opensearch-project#3514)
* update CHANGELOG.md (opensearch-project#3514)
* ci: fix overriding matrix for Linux x86 (opensearch-project#3514)
* ci: update os checks in preparation for darwin (opensearch-project#3514)

Signed-off-by: Julian Labatut <julian.labatut@etu.umontpellier.fr>
Co-authored-by: Miki <miki@amazon.com>
Co-authored-by: Kawika Avilla <kavilla414@gmail.com>
@codecov-commenter
Copy link

codecov-commenter commented Mar 14, 2023

Codecov Report

Merging #3609 (b1ba6c9) into 2.x (8bfc631) will not change coverage.
The diff coverage is n/a.

❗ Current head b1ba6c9 differs from pull request most recent head e8ee2f1. Consider uploading reports for the commit e8ee2f1 to get more accurate results

📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more

@@           Coverage Diff           @@
##              2.x    #3609   +/-   ##
=======================================
  Coverage   66.41%   66.41%           
=======================================
  Files        3206     3206           
  Lines       61597    61597           
  Branches     9503     9503           
=======================================
  Hits        40911    40911           
- Misses      18408    18409    +1     
+ Partials     2278     2277    -1     
Flag Coverage Δ
Linux ?
Windows 66.41% <ø> (?)

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

see 9 files with indirect coverage changes

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@joshuarrrr joshuarrrr merged commit f980684 into opensearch-project:2.x Mar 17, 2023
@opensearch-trigger-bot
Copy link
Contributor

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

@joshuarrrr
Copy link
Member

@kavilla I think we can skip the 2.6 backport on this

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants