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

Switch to macos-13 runner for assemble github actions due to macos-latest is now arm64 #138

Merged
merged 1 commit into from
May 2, 2024

Conversation

reta
Copy link
Collaborator

@reta reta commented May 2, 2024

Description

Switch to macos-13 runner for assemble github actions due to macos-latest is now arm64

Issues Resolved

N/A

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.

…atest is now arm64

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
@reta reta added backport 2.x backport 2.14 Issues and PRs related to version 2.14.0 labels May 2, 2024
@sarthakaggarwal97 sarthakaggarwal97 merged commit c802527 into opensearch-project:main May 2, 2024
19 checks passed
@opensearch-trigger-bot
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:

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

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

@opensearch-trigger-bot
Copy link

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

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

reta added a commit to reta/custom-codecs that referenced this pull request May 2, 2024
…atest is now arm64 (opensearch-project#138)

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
(cherry picked from commit c802527)
reta added a commit to reta/custom-codecs that referenced this pull request May 2, 2024
…atest is now arm64 (opensearch-project#138)

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
(cherry picked from commit c802527)
sarthakaggarwal97 pushed a commit that referenced this pull request May 2, 2024
…atest is now arm64 (#138) (#140)

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
(cherry picked from commit c802527)
sarthakaggarwal97 pushed a commit that referenced this pull request May 2, 2024
…atest is now arm64 (#138) (#141)

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
(cherry picked from commit c802527)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x backport 2.14 Issues and PRs related to version 2.14.0 backport-failed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants