Abouzar Parvan пре 4 година
родитељ
комит
2827ed76ab
2 измењених фајлова са 20 додато и 8 уклоњено
  1. 8 6
      .github/workflows/install.yaml
  2. 12 2
      utils/installer/install.sh

+ 8 - 6
.github/workflows/install.yaml

@@ -14,8 +14,8 @@ jobs:
       fail-fast: false
       fail-fast: false
       matrix:
       matrix:
         include:
         include:
-#           - runner: ubuntu-20.04
-#             os: linux
+          - runner: ubuntu-20.04
+            os: linux
           - runner: macos-10.15
           - runner: macos-10.15
             os: osx
             os: osx
     runs-on: ${{ matrix.runner }}
     runs-on: ${{ matrix.runner }}
@@ -27,7 +27,9 @@ jobs:
         if: matrix.os == 'linux'
         if: matrix.os == 'linux'
         run: |
         run: |
           sudo apt-get install -y gettext libtool libtool-bin autoconf automake cmake g++ pkg-config unzip build-essential
           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
       - name: Installl dependencies for OSX
         if: matrix.os == 'osx'
         if: matrix.os == 'osx'
@@ -37,13 +39,13 @@ jobs:
 
 
       - name: Install LunarVim
       - name: Install LunarVim
         run: |
         run: |
-          bash ./utils/installer/install.sh
+          bash ./utils/installer/install.sh --testing
 
 
       - name: Test LunarVim PackerCompile
       - 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
       - 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:
 #   freebsd:
 #     runs-on: macos-latest
 #     runs-on: macos-latest

+ 12 - 2
utils/installer/install.sh

@@ -101,7 +101,16 @@ installpacker() {
 
 
 cloneconfig() {
 cloneconfig() {
 	echo "Cloning LunarVim configuration"
 	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"
 	mkdir -p "$HOME/.config/lvim"
 	sudo cp "$HOME/.local/share/lunarvim/lvim/utils/bin/lvim" "/usr/local/bin"
 	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"
 	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'
 	echo '!!Warning!! -> Removing all lunarvim related config because of the --overwrite flag'
 	rm -rf "$HOME/.local/share/lunarvim"
 	rm -rf "$HOME/.local/share/lunarvim"
 	rm -rf "$HOME/.cache/nvim"
 	rm -rf "$HOME/.cache/nvim"
+	rm -rf "$HOME/.config/lvim"
 	;;
 	;;
 esac
 esac
 
 
@@ -206,7 +216,7 @@ if [ -e "$HOME/.local/share/lunarvim/lvim/init.lua" ]; then
 	echo 'LunarVim already installed'
 	echo 'LunarVim already installed'
 else
 else
 	# clone config down
 	# clone config down
-	cloneconfig
+	cloneconfig "$@"
 	# echo 'export PATH=$HOME/.config/nvim/utils/bin:$PATH' >>~/.zshrc
 	# echo 'export PATH=$HOME/.config/nvim/utils/bin:$PATH' >>~/.zshrc
 	# echo 'export PATH=$HOME/.config/lunarvim/utils/bin:$PATH' >>~/.bashrc
 	# echo 'export PATH=$HOME/.config/lunarvim/utils/bin:$PATH' >>~/.bashrc
 fi
 fi