Skip to content

Commit

Permalink
fix: mirror.ghproxy.com is GFW, use ghp.ci
Browse files Browse the repository at this point in the history
  • Loading branch information
adoyle-h committed Sep 11, 2024
1 parent bac2ad6 commit 7b6462d
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
6 changes: 3 additions & 3 deletions doc/usage/proxy.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
require('one').setup {
config = {
proxy = {
-- If you are in China Mainland, it is suggested to set 'https://mirror.ghproxy.com'. Otherwise, remove this option.
github = 'https://mirror.ghproxy.com',
-- If you are in China Mainland, it is suggested to set 'https://ghp.ci'. Otherwise, remove this option.
github = 'https://ghp.ci',
},
},
}
```

Proxy will not work for some plugins using "git submodule". It's recommended to execute `git config --global http.https://github.com.proxy https://mirror.ghproxy.com` to set global git proxy.
Proxy will not work for some plugins using "git submodule". It's recommended to execute `git config --global http.https://github.com.proxy https://ghp.ci` to set global git proxy.

6 changes: 3 additions & 3 deletions doc/usage/proxy.zh.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
require('one').setup {
config = {
proxy = {
-- 如果你在中国大陆,推荐使用 'https://mirror.ghproxy.com'。否则,不要设置该配置项。
github = 'https://mirror.ghproxy.com',
-- 如果你在中国大陆,推荐使用 'https://ghp.ci'。否则,不要设置该配置项。
github = 'https://ghp.ci',
},
},
}
```

有些插件使用了 git submodule,代理无法起作用。建议你执行 `git config --global http.https://github.com.proxy https://mirror.ghproxy.com` 设置全局代理。
有些插件使用了 git submodule,代理无法起作用。建议你执行 `git config --global http.https://github.com.proxy https://ghp.ci` 设置全局代理。
2 changes: 1 addition & 1 deletion lua/one/config/default.lua
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ return function(colors)
},

proxy = {
-- If you are in China Mainland, it is suggested to set 'https://mirror.ghproxy.com/'
-- If you are in China Mainland, it is suggested to set 'https://ghp.ci/'
github = nil, -- string|nil proxy url
},

Expand Down
4 changes: 2 additions & 2 deletions lua/one/config_spec.lua
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ describe('CM.config', function()
CM.setup({
colorcolumn = { 80, 100 },

proxy = { github = 'https://mirror.ghproxy.com/' },
proxy = { github = 'https://ghp.ci/' },

nullLS = {
sources = function(builtins)
Expand All @@ -23,7 +23,7 @@ describe('CM.config', function()

local config = CM.config

assert.are.same(config.proxy, { github = 'https://mirror.ghproxy.com/' })
assert.are.same(config.proxy, { github = 'https://ghp.ci/' })
assert.are.same(config['mason-installer'].ensureInstalled, { 'css-lsp', 'yamlfmt' })

local null_ls = require('null-ls')
Expand Down
2 changes: 1 addition & 1 deletion scripts/build-container
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ main() {
if [[ -n ${opts[p]:-} ]]; then
docker_args+=(
-t "adoyle/one.nvim:$VERSION-china"
--build-arg "GH_PROXY=https://mirror.ghproxy.com"
--build-arg "GH_PROXY=https://ghp.ci"
)

if [[ $DIST == 'ubuntu' ]]; then
Expand Down

0 comments on commit 7b6462d

Please sign in to comment.