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 the issue that merge not work with official offline package #1121

Merged
merged 2 commits into from
Feb 2, 2021

Conversation

lucklove
Copy link
Member

@lucklove lucklove commented Feb 2, 2021

What problem does this PR solve?

Close #1120

What is changed and how it works?

Don't ignore yanked versions because official offline package will yank all the versions other than that package version.

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No code

Code changes

  • Has exported function/method change
  • Has exported variable/fields change
  • Has interface methods change
  • Has persistent data change

Side effects

  • Possible performance regression
  • Increased code complexity
  • Breaking backward compatibility

Related changes

  • Need to cherry-pick to the release branch
  • Need to update the documentation

Release notes:

NONE

@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 writing /lgtm in a comment.
Reviewer can cancel approval by writing /lgtm cancel in a comment.

@ti-chi-bot ti-chi-bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Feb 2, 2021
@AstroProfundis AstroProfundis removed the request for review from breezewish February 2, 2021 07:45
@pingcap pingcap deleted a comment from ti-chi-bot Feb 2, 2021
@AstroProfundis AstroProfundis added the status/LGT1 Indicates that a PR has LGTM 1. label Feb 2, 2021
@AstroProfundis
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 18ff080

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

@lucklove: Your PR has out-of-dated, I have automatically updated it for you.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

@codecov-io
Copy link

Codecov Report

Merging #1121 (c10f642) into master (3299053) will decrease coverage by 0.04%.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1121      +/-   ##
==========================================
- Coverage   56.63%   56.58%   -0.05%     
==========================================
  Files         285      283       -2     
  Lines       20200    20117      -83     
==========================================
- Hits        11440    11384      -56     
+ Misses       6998     6973      -25     
+ Partials     1762     1760       -2     
Flag Coverage Δ
cluster 45.06% <0.00%> (+0.04%) ⬆️
dm 24.78% <0.00%> (-0.66%) ⬇️
integrate 50.97% <100.00%> (-0.07%) ⬇️
playground 20.89% <0.00%> (ø)
tiup 16.31% <100.00%> (-0.03%) ⬇️
unittest 22.92% <100.00%> (-0.04%) ⬇️

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

Impacted Files Coverage Δ
pkg/repository/merge_mirror.go 57.57% <100.00%> (ø)
components/dm/command/reload.go 52.38% <0.00%> (-19.05%) ⬇️
components/dm/command/upgrade.go 71.42% <0.00%> (-6.35%) ⬇️
pkg/utils/http_client.go 67.56% <0.00%> (-5.41%) ⬇️
components/dm/command/patch.go 50.00% <0.00%> (-5.00%) ⬇️
components/dm/command/deploy.go 68.75% <0.00%> (-3.48%) ⬇️
components/cluster/command/upgrade.go 75.00% <0.00%> (-2.78%) ⬇️
components/cluster/command/patch.go 70.00% <0.00%> (-2.73%) ⬇️
pkg/repository/store/txn.go 59.68% <0.00%> (-2.33%) ⬇️
pkg/cluster/api/pdapi.go 58.67% <0.00%> (-1.90%) ⬇️
... and 13 more

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 5380253...07d3d8c. Read the comment docs.

@ti-chi-bot ti-chi-bot merged commit 4d93059 into pingcap:master Feb 2, 2021
lucklove added a commit to lucklove/tiup that referenced this pull request Mar 4, 2021
…cap#1121)

Close pingcap#1120

Co-authored-by: Ti Chi Robot <71242396+ti-chi-bot@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
size/XS Denotes a PR that changes 0-9 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.

Merge two offline package not work
4 participants