Skip to content
This repository was archived by the owner on Feb 27, 2023. It is now read-only.

Commit 9142dd8

Browse files
committed
Merge remote-tracking branch 'upstream/master'
2 parents 11a8e77 + 84c2d69 commit 9142dd8

File tree

352 files changed

+7426
-2327
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

352 files changed

+7426
-2327
lines changed

.ci/after_failure.sh

Lines changed: 0 additions & 55 deletions
This file was deleted.

.ci/after_success.sh

Lines changed: 0 additions & 40 deletions
This file was deleted.

.ci/install.ps1

Lines changed: 0 additions & 208 deletions
This file was deleted.

.ci/install/linux.sh

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export LC_ALL=C
99
install_vim() {
1010
local URL=https://github.com/vim/vim
1111
local tag=$1
12-
local ext=$([[ $tag == "HEAD" ]] && echo "" || echo "-b $tag")
12+
local ext=$([[ $tag == "nightly" ]] && echo "" || echo "-b $tag")
1313
local tmp="$(mktemp -d)"
1414
local out="${DEPS}/_vim/$tag"
1515
mkdir -p $out
@@ -28,21 +28,16 @@ install_vim() {
2828
install_nvim() {
2929
local URL=https://github.com/neovim/neovim
3030
local tag=$1
31-
local ext=$([[ $tag == "HEAD" ]] && echo "" || echo "-b $tag")
3231
local tmp="$(mktemp -d)"
3332
local out="${DEPS}/_neovim/$tag"
3433
mkdir -p $out
35-
local ncpu=$(awk '/^processor/{n+=1}END{print n}' /proc/cpuinfo)
36-
git clone --depth 1 --single-branch $ext $URL $tmp
37-
cd $tmp
38-
sed -i '30d' ./third-party/cmake/BuildLibvterm.cmake
39-
make deps
40-
make -j$ncpu \
41-
CMAKE_BUILD_TYPE=Release \
42-
CMAKE_EXTRA_FLAGS="-DTRAVIS_CI_BUILD=ON -DCMAKE_INSTALL_PREFIX:PATH=$out"
43-
make install
44-
pip3 install --upgrade "pip < 21.0"
45-
pip3 install pynvim
34+
curl -o $tmp/nvim-linux64.tar.gz -L "https://github.com/neovim/neovim/releases/download/$tag/nvim-linux64.tar.gz"
35+
tar -xzvf $tmp/nvim-linux64.tar.gz -C $tmp
36+
cp -r $tmp/nvim-linux64/* $out
37+
chmod +x $out/bin/nvim
38+
# fix ModuleNotFoundError: No module named 'setuptools'
39+
python3 -m pip install -U setuptools
40+
python3 -m pip install pynvim
4641
}
4742

4843
install() {

.ci/install/windows.ps1

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
function install_vim($ver)
2+
{
3+
if ($ver -eq "nightly")
4+
{
5+
$url1 = 'https://github.com/vim/vim-win32-installer/releases/download/v8.2.3361/gvim_8.2.3361_x86.zip'
6+
}
7+
else
8+
{
9+
$ver = $ver -replace "^v", ""
10+
$url1 = 'https://github.com/vim/vim-win32-installer/releases/download/v' + $ver + '/gvim_' + $ver + '_x86.zip'
11+
}
12+
$Env:VIM_BIN = $Env:DEPS + '\vim\vim82\vim.exe'
13+
$zip1 = $Env:DEPS + '\vim.zip'
14+
(New-Object Net.WebClient).DownloadFile($url1, $zip1)
15+
[Reflection.Assembly]::LoadWithPartialName('System.IO.Compression.FileSystem') > $null
16+
[System.IO.Compression.ZipFile]::ExtractToDirectory($zip1, $Env:DEPS)
17+
}
18+
19+
function install_nvim($ver)
20+
{
21+
if ($ver -eq "nightly")
22+
{
23+
$url = 'https://github.com/neovim/neovim/releases/download/nightly/nvim-win32.zip'
24+
}
25+
else
26+
{
27+
$url = 'https://github.com/neovim/neovim/releases/download/' + $ver + '/nvim-win64.zip'
28+
}
29+
$Env:VIM_BIN = $Env:DEPS + '\Neovim\bin\nvim.exe'
30+
$zip = $Env:DEPS + '\nvim.zip'
31+
(New-Object Net.WebClient).DownloadFile($url, $zip)
32+
[Reflection.Assembly]::LoadWithPartialName('System.IO.Compression.FileSystem') > $null
33+
[System.IO.Compression.ZipFile]::ExtractToDirectory($zip, $Env:DEPS)
34+
}
35+
36+
function download_lua()
37+
{
38+
$url = 'https://github.com/wsdjeg/vim-galore-zh_cn/releases/download/downdows/lua53.zip'
39+
$zip = $Env:DEPS + '\lua53.zip'
40+
(New-Object Net.WebClient).DownloadFile($url, $zip)
41+
[Reflection.Assembly]::LoadWithPartialName('System.IO.Compression.FileSystem') > $null
42+
[System.IO.Compression.ZipFile]::ExtractToDirectory($zip, $Env:DEPS + '\vim\vim82')
43+
}
44+
45+
if ($Env:VIM_BIN.StartsWith("nvim"))
46+
{
47+
mkdir $Env:DEPS
48+
install_nvim $Env:VIM_TAG
49+
}
50+
elseif ($Env:VIM_BIN.StartsWith("vim"))
51+
{
52+
mkdir $Env:DEPS
53+
install_vim $Env:VIM_TAG
54+
download_lua
55+
}

0 commit comments

Comments
 (0)