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

Format the json files to avoid autocut PRs #291

Merged
merged 1 commit into from
Sep 11, 2024

Conversation

gaobinlong
Copy link
Collaborator

@gaobinlong gaobinlong commented Sep 11, 2024

Description

There're many autocut PRs in this repo which only removes the end of line of the file opensearch_dashboards.json or package.json, which are annoying, we should forma the json files, remove the end of line from them, in order to avoid these autocut PRs.

Issues Resolved

[List any issues this PR will resolve]

Check List

  • New functionality includes testing.
    • All tests pass, including unit test, integration test.
  • New functionality has user manual doc 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.

@ruanyl ruanyl merged commit 651dc99 into opensearch-project:main Sep 11, 2024
10 of 23 checks passed
opensearch-trigger-bot bot pushed a commit that referenced this pull request Sep 11, 2024
Signed-off-by: gaobinlong <[email protected]>
(cherry picked from commit 651dc99)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
gaobinlong pushed a commit that referenced this pull request Sep 12, 2024
(cherry picked from commit 651dc99)

Signed-off-by: gaobinlong <[email protected]>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
opensearch-trigger-bot bot pushed a commit that referenced this pull request Sep 12, 2024
Signed-off-by: gaobinlong <[email protected]>
(cherry picked from commit 651dc99)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@opensearch-trigger-bot
Copy link
Contributor

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

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

gaobinlong pushed a commit that referenced this pull request Sep 12, 2024
(cherry picked from commit 651dc99)

Signed-off-by: gaobinlong <[email protected]>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
raintygao pushed a commit to raintygao/dashboards-assistant that referenced this pull request Jan 22, 2025
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.

3 participants