diff options
| -rw-r--r-- | .github/workflows/install.yaml | 14 | ||||
| -rwxr-xr-x | utils/installer/install.sh | 14 |
2 files changed, 20 insertions, 8 deletions
diff --git a/.github/workflows/install.yaml b/.github/workflows/install.yaml index e0b7a179..9b664f1a 100644 --- a/.github/workflows/install.yaml +++ b/.github/workflows/install.yaml @@ -14,8 +14,8 @@ jobs: fail-fast: false matrix: include: -# - runner: ubuntu-20.04 -# os: linux + - runner: ubuntu-20.04 + os: linux - runner: macos-10.15 os: osx runs-on: ${{ matrix.runner }} @@ -27,7 +27,9 @@ jobs: if: matrix.os == 'linux' run: | sudo apt-get install -y gettext libtool libtool-bin autoconf automake cmake g++ pkg-config unzip build-essential - sudo bash ./utils/bin/install-latest-neovim + sudo add-apt-repository ppa:neovim-ppa/unstable -y + sudo apt-get update + sudo apt-get install neovim -y - name: Installl dependencies for OSX if: matrix.os == 'osx' @@ -37,13 +39,13 @@ jobs: - name: Install LunarVim run: | - bash ./utils/installer/install.sh + bash ./utils/installer/install.sh --testing - name: Test LunarVim PackerCompile - run: if nvim --headless +PackerCompile -c ':qall' 2>&1|grep -q 'Error'; then false; fi + run: if lvim --headless +PackerCompile -c ':qall' 2>&1|grep -q 'Error'; then false; fi - name: Test LunarVim Health - run: if nvim --headless +checkhealth -c ':qall' 2>&1|grep -q 'Error'; then false; fi + run: if lvim --headless +checkhealth -c ':qall' 2>&1|grep -q 'Error'; then false; fi # freebsd: # runs-on: macos-latest diff --git a/utils/installer/install.sh b/utils/installer/install.sh index 2840f085..9ec19bd5 100755 --- a/utils/installer/install.sh +++ b/utils/installer/install.sh @@ -101,7 +101,16 @@ installpacker() { cloneconfig() { echo "Cloning LunarVim configuration" - git clone --branch "$LVBRANCH" https://github.com/ChristianChiarulli/lunarvim.git ~/.local/share/lunarvim/lvim + mkdir -p ~/.local/share/lunarvim + case "$@" in + + *--testing*) + cp -r "$(pwd)" ~/.local/share/lunarvim/lvim + ;; + *) + git clone --branch "$LVBRANCH" https://github.com/ChristianChiarulli/lunarvim.git ~/.local/share/lunarvim/lvim + ;; + esac mkdir -p "$HOME/.config/lvim" sudo cp "$HOME/.local/share/lunarvim/lvim/utils/bin/lvim" "/usr/local/bin" cp "$HOME/.local/share/lunarvim/lvim/utils/installer/lv-config.example-no-ts.lua" "$HOME/.config/lvim/lv-config.lua" @@ -181,6 +190,7 @@ case "$@" in echo '!!Warning!! -> Removing all lunarvim related config because of the --overwrite flag' rm -rf "$HOME/.local/share/lunarvim" rm -rf "$HOME/.cache/nvim" + rm -rf "$HOME/.config/lvim" ;; esac @@ -206,7 +216,7 @@ if [ -e "$HOME/.local/share/lunarvim/lvim/init.lua" ]; then echo 'LunarVim already installed' else # clone config down - cloneconfig + cloneconfig "$@" # echo 'export PATH=$HOME/.config/nvim/utils/bin:$PATH' >>~/.zshrc # echo 'export PATH=$HOME/.config/lunarvim/utils/bin:$PATH' >>~/.bashrc fi |