Skip to content

Commit a325ce5

Browse files
committed
chore: remove unstable proxy servers
1 parent ceaeeb7 commit a325ce5

File tree

10 files changed

+161
-133
lines changed

10 files changed

+161
-133
lines changed

.github/workflows/coverage-report.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
- name: Set up Go
1313
uses: actions/setup-go@v4
1414
with:
15-
go-version: 1.18.x
15+
go-version: 1.19.x
1616
- uses: actions/checkout@v3.6.0
1717
- name: Test
1818
run: |

.github/workflows/pull-request.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- name: Set up Go
1414
uses: actions/setup-go@v4
1515
with:
16-
go-version: 1.18
16+
go-version: 1.19
1717
id: go
1818
- name: Check out code into the Go module directory
1919
uses: actions/checkout@v3.6.0
@@ -54,7 +54,7 @@ jobs:
5454
- name: Set up Go
5555
uses: actions/setup-go@v4
5656
with:
57-
go-version: 1.18
57+
go-version: 1.19
5858
id: go
5959
- name: Check out code into the Go module directory
6060
uses: actions/checkout@v3.6.0

.github/workflows/release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Set up Go
1717
uses: actions/setup-go@v4
1818
with:
19-
go-version: 1.18
19+
go-version: 1.19
2020
- name: Image Registry Login
2121
run: |
2222
docker login --username ${{ secrets.DOCKER_HUB_USER }} --password ${{secrets.DOCKER_HUB_TOKEN}}

cmd/root.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,6 @@ func NewRoot(cxt context.Context) (cmd *cobra.Command) {
5050

5151
for _, c := range cmd.Commands() {
5252
registerFlagCompletionFunc(c, "provider", ArrayCompletion(ProviderGitHub, ProviderGitee))
53-
registerFlagCompletionFunc(c, "proxy-github", ArrayCompletion("gh.api.99988866.xyz",
54-
"gh-proxy.com"))
5553
registerFlagCompletionFunc(c, "os", ArrayCompletion("window", "linux", "darwin"))
5654
registerFlagCompletionFunc(c, "arch", ArrayCompletion("amd64", "arm64"))
5755
registerFlagCompletionFunc(c, "format", ArrayCompletion("tar.gz", "zip", "msi"))

cmd/search.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,7 @@ func (s *searchOption) addFlags(flags *pflag.FlagSet) {
4242
flags.StringVarP(&s.Provider, "provider", "", viper.GetString("provider"), "The file provider")
4343
flags.StringVarP(&s.ProxyGitHub, "proxy-github", "", viper.GetString("proxy-github"),
4444
`The proxy address of github.com, the proxy address will be the prefix of the final address.
45-
Available proxy: gh.api.99988866.xyz, gh-proxy.com
46-
Thanks to https://github.com/hunshcn/gh-proxy`)
45+
Submit the new proxy server in https://github.com/LinuxSuRen/hd-home`)
4746
}
4847

4948
func (s *searchOption) runE(c *cobra.Command, args []string) (err error) {

cmd/setup.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,11 @@ type setupOption struct {
4040

4141
func (o *setupOption) runE(cmd *cobra.Command, args []string) (err error) {
4242
logger := log.GetLoggerFromContextOrDefault(cmd)
43+
proxyServers := []string{""}
44+
proxyServers = append(proxyServers, installer.GetProxyServers()...)
4345

4446
if o.proxy == "" {
45-
if o.proxy, err = selectFromList([]string{"", "gh-proxy.com", "gh.api.99988866.xyz"},
47+
if o.proxy, err = selectFromList(proxyServers,
4648
o.v.GetString("proxy-github"),
4749
"Select proxy-github", o.stdio); err != nil {
4850
return

go.mod

Lines changed: 26 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
module github.com/linuxsuren/http-downloader
22

3-
go 1.18
3+
go 1.19
44

55
require (
66
github.com/AlecAivazis/survey/v2 v2.3.2
7-
github.com/go-git/go-git/v5 v5.4.2
7+
github.com/go-git/go-git/v5 v5.10.1
88
github.com/golang/mock v1.6.0
99
github.com/google/go-github/v29 v29.0.3
1010
github.com/h2non/gock v1.0.9
1111
github.com/hinshun/vt10x v0.0.0-20220119200601-820417d04eec
1212
github.com/linuxsuren/cobra-extension v0.0.16
1313
github.com/mitchellh/go-homedir v1.1.0
1414
github.com/onsi/ginkgo v1.16.5
15-
github.com/onsi/gomega v1.18.1
15+
github.com/onsi/gomega v1.27.10
1616
github.com/spf13/cobra v1.6.1
1717
github.com/spf13/pflag v1.0.5
1818
github.com/spf13/viper v1.9.0
@@ -30,31 +30,37 @@ require (
3030
)
3131

3232
require (
33+
dario.cat/mergo v1.0.0 // indirect
34+
github.com/cloudflare/circl v1.3.3 // indirect
35+
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
36+
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
37+
github.com/google/go-cmp v0.6.0 // indirect
3338
github.com/mattn/go-runewidth v0.0.14 // indirect
3439
github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db // indirect
35-
github.com/prometheus/client_golang v1.11.1 // indirect
40+
github.com/pjbgf/sha1cd v0.3.0 // indirect
3641
github.com/rivo/uniseg v0.4.3 // indirect
42+
github.com/skeema/knownhosts v1.2.1 // indirect
43+
golang.org/x/mod v0.12.0 // indirect
44+
golang.org/x/tools v0.13.0 // indirect
3745
)
3846

3947
require (
40-
github.com/Microsoft/go-winio v0.4.16 // indirect
48+
github.com/Microsoft/go-winio v0.6.1 // indirect
4149
github.com/Netflix/go-expect v0.0.0-20220104043353-73e0943537d2
42-
github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7 // indirect
43-
github.com/acomagu/bufpipe v1.0.3 // indirect
50+
github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371 // indirect
4451
github.com/blang/semver/v4 v4.0.0
4552
github.com/davecgh/go-spew v1.1.1 // indirect
46-
github.com/emirpasic/gods v1.12.0 // indirect
53+
github.com/emirpasic/gods v1.18.1 // indirect
4754
github.com/fsnotify/fsnotify v1.5.1 // indirect
48-
github.com/go-git/gcfg v1.5.0 // indirect
49-
github.com/go-git/go-billy/v5 v5.3.1 // indirect
50-
github.com/golang/protobuf v1.5.2 // indirect
55+
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
56+
github.com/go-git/go-billy/v5 v5.5.0 // indirect
57+
github.com/golang/protobuf v1.5.3 // indirect
5158
github.com/google/go-querystring v1.0.0 // indirect
5259
github.com/hashicorp/hcl v1.0.0 // indirect
53-
github.com/imdario/mergo v0.3.12 // indirect
5460
github.com/inconshreveable/mousetrap v1.0.1 // indirect
5561
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
5662
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
57-
github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351 // indirect
63+
github.com/kevinburke/ssh_config v1.2.0 // indirect
5864
github.com/magiconair/properties v1.8.5 // indirect
5965
github.com/mattn/go-colorable v0.1.6 // indirect
6066
github.com/mattn/go-isatty v0.0.17 // indirect
@@ -69,15 +75,15 @@ require (
6975
github.com/spf13/cast v1.4.1 // indirect
7076
github.com/spf13/jwalterweatherman v1.1.0 // indirect
7177
github.com/subosito/gotenv v1.2.0 // indirect
72-
github.com/xanzy/ssh-agent v0.3.0 // indirect
73-
golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd // indirect
74-
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd
78+
github.com/xanzy/ssh-agent v0.3.3 // indirect
79+
golang.org/x/crypto v0.15.0 // indirect
80+
golang.org/x/net v0.18.0
7581
golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect
76-
golang.org/x/sys v0.5.0 // indirect
77-
golang.org/x/term v0.5.0 // indirect
78-
golang.org/x/text v0.3.8 // indirect
82+
golang.org/x/sys v0.14.0 // indirect
83+
golang.org/x/term v0.14.0 // indirect
84+
golang.org/x/text v0.14.0 // indirect
7985
google.golang.org/appengine v1.6.7 // indirect
80-
google.golang.org/protobuf v1.27.1 // indirect
86+
google.golang.org/protobuf v1.28.0 // indirect
8187
gopkg.in/ini.v1 v1.63.2 // indirect
8288
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
8389
gopkg.in/warnings.v0 v0.1.2 // indirect

0 commit comments

Comments
 (0)