WIP: Make TiUP compatible with usql v0.19.19#2691
Draft
ottok wants to merge 1 commit intopingcap:masterfrom
Draft
WIP: Make TiUP compatible with usql v0.19.19#2691ottok wants to merge 1 commit intopingcap:masterfrom
ottok wants to merge 1 commit intopingcap:masterfrom
Conversation
As the golang-github-xo-usql-dev package v0.19.19 in Debian is
newer than the v0.9.5 in go.mod of TiUP, the Debian build failed on:
src/github.com/pingcap/tiup/components/client/main.go:98:33: not enough arguments in call to rline.New
have (bool, string, string)
want (bool, bool, bool, string, string)
src/github.com/pingcap/tiup/components/client/main.go:102:70: not enough arguments in call to handler.New
have (rline.IO, *user.User, string, bool)
want (rline.IO, *user.User, string, billy.Filesystem, bool)
Apply these changes on TiUP to make it compatible:
- `rline.New` now requires two additional boolean arguments. These are
set to `false` as safe defaults.
- `handler.New` now requires a `billy.Filesystem` argument. This is
provided by importing `osfs` and creating a new `osfs.New` instance
using the instance data directory.
ti-chi-bot
bot
added
the
do-not-merge/work-in-progress
Contributor
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
ti-chi-bot
bot
added
contribution
size/XS
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## master #2691 +/- ##
==========================================
+ Coverage 38.35% 39.20% +0.85%
==========================================
Files 424 396 -28
Lines 47043 45751 -1292
==========================================
- Hits 18042 17934 -108
+ Misses 26595 25133 -1462
- Partials 2406 2684 +278 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This is a draft as I am evaluating updating directly to latest usql v0.20.8 as an alternative.
As the golang-github-xo-usql-dev package v0.19.19 in Debian is newer than the v0.9.5 in go.mod of TiUP, the Debian build failed on:
Apply these changes on TiUP to make it compatible:
rline.Newnow requires two additional boolean arguments. These are set tofalseas safe defaults.handler.Newnow requires abilly.Filesystemargument. This is provided by importingosfsand creating a newosfs.Newinstance using the instance data directory.What problem does this PR solve?
Closes: #2588.
Origin: https://salsa.debian.org/go-team/packages/tiup/-/blob/b12259882f8fdca0d9b4dec3ebc9c5ba99dffc03/debian/patches/0002-Make-TiUP-compatible-with-usql-v0.19.19.patch
What is changed and how it works?
See commit message and details.
Check List
Tests
Side effects
Related changes
Release notes: