From 7b6462d538d57b064d9f036420d4248e031873e7 Mon Sep 17 00:00:00 2001 From: ADoyle Date: Wed, 11 Sep 2024 20:17:15 +0800 Subject: [PATCH] fix: mirror.ghproxy.com is GFW, use ghp.ci --- doc/usage/proxy.md | 6 +++--- doc/usage/proxy.zh.md | 6 +++--- lua/one/config/default.lua | 2 +- lua/one/config_spec.lua | 4 ++-- scripts/build-container | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/doc/usage/proxy.md b/doc/usage/proxy.md index a5e40c1..a4b0cea 100644 --- a/doc/usage/proxy.md +++ b/doc/usage/proxy.md @@ -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. diff --git a/doc/usage/proxy.zh.md b/doc/usage/proxy.zh.md index 0433ba2..f54c4ed 100644 --- a/doc/usage/proxy.zh.md +++ b/doc/usage/proxy.zh.md @@ -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` 设置全局代理。 diff --git a/lua/one/config/default.lua b/lua/one/config/default.lua index 56aa84a..0b805f5 100644 --- a/lua/one/config/default.lua +++ b/lua/one/config/default.lua @@ -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 }, diff --git a/lua/one/config_spec.lua b/lua/one/config_spec.lua index 7703438..9554d1e 100644 --- a/lua/one/config_spec.lua +++ b/lua/one/config_spec.lua @@ -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) @@ -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') diff --git a/scripts/build-container b/scripts/build-container index 20ee0e2..353eeca 100755 --- a/scripts/build-container +++ b/scripts/build-container @@ -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