fix(tests): use proper runtimepath and only run windows tests

kkoomen · Oct 31, 2020 · 0d72744 · 0d72744
1 parent 4a4e74d
commit 0d72744
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 4 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -12,9 +12,9 @@ jobs:
     name: Vim
     strategy:
       matrix:
-        os: [macos-latest, ubuntu-latest, windows-latest]
-        vim-version: [v7.4.2119, head]
-        node-version: [10, 12, 14]
+        os: [windows-latest]
+        vim-version: [head]
+        node-version: [14]
         include:
           - os: macos-latest
             target: macos
@@ -54,6 +54,52 @@ jobs:
         run: ./scripts/run-vader-tests.sh "${{ steps.vim.outputs.executable }}"
         shell: bash
 
+  # tests_vim:
+  #   name: Vim
+  #   strategy:
+  #     matrix:
+  #       os: [macos-latest, ubuntu-latest, windows-latest]
+  #       vim-version: [v7.4.2119, head]
+  #       node-version: [10, 12, 14]
+  #       include:
+  #         - os: macos-latest
+  #           target: macos
+  #         - os: ubuntu-latest
+  #           target: linux
+  #         - os: windows-latest
+  #           target: win
+  #   runs-on: ${{ matrix.os }}
+  #   steps:
+  #     - name: Checkout kkoomen/vim-doge
+  #       uses: actions/checkout@v2
+  #       with:
+  #         submodules: true
+  #     - name: Checkout junegunn/vader.vim
+  #       uses: actions/checkout@v2
+  #       with:
+  #         repository: junegunn/vader.vim
+  #         path: vader
+  #     - name: Setup nodejs
+  #       uses: actions/setup-node@v1
+  #       with:
+  #         node-version: ${{ matrix.node-version }}
+  #     - run: npm ci --no-save
+  #     - name: Build Unix binary
+  #       if: matrix.target != 'win'
+  #       run: npm run build:binary -- node${{ matrix.node-version }}-${{ matrix.target }}-x64
+  #     - name: Build Windows binary
+  #       if: matrix.target == 'win'
+  #       run: npm run build:binary:windows -- node${{ matrix.node-version }}-${{ matrix.target }}-x64
+  #     - name: Setup vim
+  #       uses: thinca/action-setup-vim@v1
+  #       id: vim
+  #       with:
+  #         vim_version: ${{ matrix.vim-version }}
+  #         vim_type: vim
+  #     - name: Run tests
+  #       run: ./scripts/run-vader-tests.sh "${{ steps.vim.outputs.executable }}"
+  #       shell: bash
+
   # tests_neovim:
   #   name: NeoVim
   #   strategy:

diff --git a/test/vimrc b/test/vimrc
@@ -1,6 +1,8 @@
 " vint: -ProhibitSetNoCompatible
 
-call execute('set runtimepath=' . getcwd() . ',' . getcwd() . '/vader')
+" call execute('set runtimepath=' . getcwd() . ',' . getcwd() . '/vader')
+set runtimepath^=$PWD
+set runtimepath^=$PWD/vader
 
 " Set a variable to indicate we're inside a test env.
 let g:doge_test_env = 1