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: fix tars redundant merge base operation problem #720

Merged
merged 5 commits into from
Sep 3, 2021

Conversation

Mini256
Copy link
Member

@Mini256 Mini256 commented Sep 2, 2021

part of #643

@ti-chi-bot
Copy link
Member

[REVIEW NOTIFICATION]

This pull request has not been approved.

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot ti-chi-bot added dco-signoff: yes Indicates the PR's author has signed the dco. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Sep 2, 2021
@ti-chi-bot ti-chi-bot requested a review from mini-bot September 2, 2021 08:30
@github-actions
Copy link

github-actions bot commented Sep 2, 2021

🎊 PR Preview b5549a3 has been successfully built and deployed to https://ti-community-infra-tichi-preview-pr-720.surge.sh

🕐 Build time: 0.01s

🤖 By surge-preview

@codecov
Copy link

codecov bot commented Sep 2, 2021

Codecov Report

Merging #720 (b5549a3) into master (d9c49fb) will decrease coverage by 0.01%.
The diff coverage is 75.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #720      +/-   ##
==========================================
- Coverage   80.70%   80.68%   -0.02%     
==========================================
  Files          17       17              
  Lines        2415     2423       +8     
==========================================
+ Hits         1949     1955       +6     
- Misses        305      306       +1     
- Partials      161      162       +1     
Impacted Files Coverage Δ
internal/pkg/externalplugins/tars/tars.go 77.77% <75.00%> (-0.10%) ⬇️
internal/pkg/externalplugins/merge/merge.go 83.88% <0.00%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update d9c49fb...b5549a3. Read the comment docs.

@Mini256 Mini256 changed the title fix tars redundant merge base operation problem fix: fix tars redundant merge base operation problem Sep 3, 2021
@Mini256 Mini256 added the status/LGT1 Indicates that a PR has LGTM 1. label Sep 3, 2021
@Mini256
Copy link
Member Author

Mini256 commented Sep 3, 2021

/merge

@ti-chi-bot
Copy link
Member

This pull request has been accepted and is ready to merge.

Commit hash: a081e2e

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Sep 3, 2021
@Mini256
Copy link
Member Author

Mini256 commented Sep 3, 2021

/hold

@ti-chi-bot ti-chi-bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 3, 2021
@ti-chi-bot ti-chi-bot removed the status/can-merge Indicates a PR has been approved by a committer. label Sep 3, 2021
@Mini256
Copy link
Member Author

Mini256 commented Sep 3, 2021

/merge

@ti-chi-bot
Copy link
Member

This pull request has been accepted and is ready to merge.

Commit hash: b5549a3

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Sep 3, 2021
@Mini256
Copy link
Member Author

Mini256 commented Sep 3, 2021

/unhold

@ti-chi-bot ti-chi-bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 3, 2021
ti-chi-bot added a commit that referenced this pull request Sep 3, 2021
{"job":{"type":"presubmit","job":"pull-tichi-rerere","buildid":"1433673676024188928","prowjobid":"9b12fe4c-0c7d-11ec-852f-4edbf37f62c8","refs":{"org":"ti-community-infra","repo":"tichi","base_ref":"master","base_sha":"6940ababec8de7d492960663a97c25af2eb96324","pulls":[{"number":720,"author":"Mini256","sha":"b5549a3d6626a4ddbff7c02d5a1e5758b55cf8dc","title":"fix: fix tars redundant merge base operation problem"}]},"decoration_config":{"utility_images":{"clonerefs":"gcr.io/k8s-prow/clonerefs:v20210723-55eee17612","initupload":"gcr.io/k8s-prow/initupload:v20210723-55eee17612","entrypoint":"gcr.io/k8s-prow/entrypoint:v20210723-55eee17612","sidecar":"gcr.io/k8s-prow/sidecar:v20210723-55eee17612"},"gcs_configuration":{"bucket":"gs://prow-tidb-logs","path_strategy":"explicit"},"gcs_credentials_secret":"gcs-credentials"}},"options":{"retesting-branch":"rerere","retry":3,"require_contexts":{},"timeout":900000000000},"current_retry_times":1,"time":"2021-09-03T06:13:22.991162848Z"}
@ti-chi-bot ti-chi-bot merged commit 9a5f235 into ti-community-infra:master Sep 3, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dco-signoff: yes Indicates the PR's author has signed the dco. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT1 Indicates that a PR has LGTM 1.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants