diff --git a/.ci/install.sh b/.ci/install.sh deleted file mode 100755 index c18aa4b23..000000000 --- a/.ci/install.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env bash - -# Fail on unset variables and command errors -set -ue -o pipefail - -# Prevent commands misbehaving due to locale differences -export LC_ALL=C - -.ci/install/linux.sh $VIM_BIN $VIM_TAG -if [ "$VIM_BIN" = "nvim" ]; then - export PATH="${DEPS}/_neovim/${VIM_TAG}/bin:${PATH}" - export VIM="${DEPS}/_neovim/${VIM_TAG}/share/nvim/runtime" -else - export PATH="${DEPS}/_vim/${VIM_TAG}/bin:${PATH}" - export VIM="${DEPS}/_vim/${VIM_TAG}/share/vim" -fi - -echo "\$VIM: \"${VIM}\"" -echo "================= nvim version ======================" -$VIM_BIN --version diff --git a/.ci/install/linux.sh b/.ci/install/linux.sh index 417e2be49..e55bdeb52 100755 --- a/.ci/install/linux.sh +++ b/.ci/install/linux.sh @@ -1,3 +1,11 @@ +#!/usr/bin/env bash + +# Fail on unset variables and command errors +set -ue -o pipefail + +# Prevent commands misbehaving due to locale differences +export LC_ALL=C + install_vim() { local URL=https://github.com/vim/vim local tag=$1 diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 4bfbe7a52..500bf9b38 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -9,19 +9,24 @@ jobs: matrix: include: - vimbin: vim - vimtag: ["v7.4.052", "v7.4.629", "v7.4.1689", "v8.0.0027", "v8.0.1453", "v8.1.2269"] + vimtag: v8.1.2269 + # vimtag: ["v7.4.052", "v7.4.629", "v7.4.1689", "v8.0.0027", "v8.0.1453", "v8.1.2269"] - vimbin: nvim - vimtag: ["v0.4.3", "v0.4.3", "v0.4.3", "v0.4.2", "v0.3.8", "v0.3.7", "v0.3.5", "v0.3.4", "v0.3.3", "v0.3.2", "v0.3.1", "v0.3.0"] - runs-on: ubuntu-latest + vimtag: v0.4.4 + # vimtag: ["v0.4.3", "v0.4.3", "v0.4.3", "v0.4.2", "v0.3.8", "v0.3.7", "v0.3.5", "v0.3.4", "v0.3.3", "v0.3.2", "v0.3.1", "v0.3.0"] + runs-on: ubuntu-16.04 + env: + VIM_BIN: ${{ matrix.vimbin }} + VIM_TAG: ${{ matrix.vimtag }} + DEPS: /home/runner/work/SpaceVim/deps steps: - name: Checkout uses: actions/checkout@master + - name: Install dependencies + run: | + sudo apt-get update + sudo apt-get install -y autoconf automake build-essential cmake gcc-multilib gettext gperf libtool-bin locales ninja-build pkg-config unzip - name: Install ${{ matrix.vimbin }} ${{ matrix.vimtag }} - env: - VIM_BIN: matrix.vimbin - VIM_TAG: matrix.vimtag - DEPS: ~/deps - PATH: ~/deps/bin:~/vim/bin:$PATH run: | .ci/install/linux.sh $VIM_BIN $VIM_TAG - name: Review ${{ matrix.vimbin }} version @@ -40,9 +45,8 @@ jobs: echo "\$VIM: \"${VIM}\"" echo "================= ${VIM_BIN} version ======================" $VIM_BIN --version - pip install covimerage - pip install codecov - python -c 'import os,sys,fcntl; flags = fcntl.fcntl(sys.stdout, fcntl.F_GETFL); fcntl.fcntl(sys.stdout, fcntl.F_SETFL, flags&~os.O_NONBLOCK);' + pip install --upgrade "pip < 21.0" + pip install covimerage virtualenv codecov make test_coverage covimerage -vv xml --omit 'build/*' codecov -X search gcov pycov -f coverage.xml diff --git a/test/api/file.vader b/test/api/file.vader index 3bb2185f2..faba4d24f 100644 --- a/test/api/file.vader +++ b/test/api/file.vader @@ -7,6 +7,8 @@ Execute ( SpaceVim api: file.fticon ): Execute ( SpaceVim api: file.unify_path ): let path = fnamemodify('.SpaceVim.d/init.vim', ':p') AssertEqual file.unify_path(path, ':p'), fnamemodify('.SpaceVim.d/init.vim', ':p:gs?[\\/]?/?') + let path = '~/.SpaceVim.d' + AssertEqual file.unify_path(path, ':p')[-1:], '/' Execute ( SpaceVim api: file.findfile ): let path = fnamemodify('.SpaceVim.d/init.vim', ':p')