test

cursorless-dev · May 21, 2024 · 39b0bd9 · 39b0bd9
1 parent aa0b83a
commit 39b0bd9
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 48 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -15,40 +15,30 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # XXX: target all platforms?
         # os: [macos-latest, ubuntu-latest, windows-latest]
         os: [ubuntu-latest]
-        # XXX: target all app versions?
-        # NB: stable: is 0.10.0 and only has nvim.exe (no nvim-qt.exe)
-        # NB: nightly: is NVIM v0.11.0-dev-25+g0e187fe03 in May 2024
-        # app_version: [v0.9.5, v0.10.0, stable, nightly]
+        # app_version: [stable]
         app_version: [v0.10.0]
-        # XXX: target all node versions?
-        # NB: error while downloading v16.20.2, v17.9.1 on macos/ubuntu at least
-        # node_version: [v18.20.2, v19.9.0, v20.13.1, v21.7.3, v22.2.0]
-        node_version: [v18.20.2]
-        # XXX: there is no concept of "legacy" in neovim but maybe "v0.9.5" would fit the bill?
         # include:
         #   - os: ubuntu-latest
+        #     # app_version: v0.9.5
         #     app_version: legacy
     runs-on: ${{ matrix.os }}
     env:
       APP_VERSION: ${{ matrix.app_version }}
-      APP_CRASH_DIR: ${{ github.workspace }}/artifacts/dumps
-      APP_LOGS_DIR: ${{ github.workspace }}/artifacts/logs
+      VSCODE_CRASH_DIR: ${{ github.workspace }}/artifacts/dumps
+      VSCODE_LOGS_DIR: ${{ github.workspace }}/artifacts/logs
       CURSORLESS_REPO_ROOT: ${{ github.workspace }}
     steps:
       - uses: actions/checkout@v4
       - run: corepack enable
       # XXX - run over different node versions: https://nodejs.org/en/about/previous-releases
       - uses: actions/setup-node@v4
         with:
-          # XXX - use same v20.12.1 taken from .nvmrc file?
           # node-version-file: .nvmrc
-          # node-version: v21.7.1
-          node-version: ${{ matrix.node_version }}
+          node-version: v18.20.2
           cache: pnpm
-      - run: mkdir -p "${{ env.APP_CRASH_DIR }}" "${{ env.APP_LOGS_DIR }}"
+      - run: mkdir -p "${{ env.VSCODE_CRASH_DIR }}" "${{ env.VSCODE_LOGS_DIR }}"
         shell: bash
       - run: pnpm --color install
       - run: pnpm --color compile
@@ -65,25 +55,23 @@ jobs:
         if: runner.os == 'Windows'
       - run: find /Users/runner/work/cursorless/cursorless/dist
         if: runner.os == 'macOS'
-      # XXX - is there a better way to execute all these commands?
       - name: Install cursorless.nvim dependencies
         run: npm install -g neovim@5.1.0
-      - run: git clone https://github.com/vim-scripts/BufOnly.vim /home/runner/BufOnly.vim
-        if: runner.os == 'Linux'
-      - run: git clone https://github.com/hands-free-vim/talon.nvim /home/runner/talon.nvim
-        if: runner.os == 'Linux'
-      - run: git clone https://github.com/MunifTanjim/nui.nvim /home/runner/nui.nvim
-        if: runner.os == 'Linux'
-      - run: git clone https://github.com/folke/noice.nvim /home/runner/noice.nvim
-        if: runner.os == 'Linux'
-      - run: git clone https://github.com/vim-scripts/BufOnly.vim C:\Users\runneradmin\BufOnly.vim
-        if: runner.os == 'Windows'
-      - run: git clone https://github.com/hands-free-vim/talon.nvim C:\Users\runneradmin\talon.nvim
-        if: runner.os == 'Windows'
-      - run: git clone https://github.com/vim-scripts/BufOnly.vim /Users/runner//BufOnly.vim
-        if: runner.os == 'macOS'
-      - run: git clone https://github.com/hands-free-vim/talon.nvim /Users/runner//talon.nvim
-        if: runner.os == 'macOS'
+      - run: bash -x scripts/install-neovim-dependencies.sh
+      # XXX - is there a better way to execute all these commands?
+      # put them into a install-neovim-dependencies.sh script and rely on the HOME env variable
+      # - run: git clone https://github.com/vim-scripts/BufOnly.vim /home/runner/BufOnly.vim
+      #   if: runner.os == 'Linux'
+      # - run: git clone https://github.com/hands-free-vim/talon.nvim /home/runner/talon.nvim
+      #   if: runner.os == 'Linux'
+      # - run: git clone https://github.com/vim-scripts/BufOnly.vim C:\Users\runneradmin\BufOnly.vim
+      #   if: runner.os == 'Windows'
+      # - run: git clone https://github.com/hands-free-vim/talon.nvim C:\Users\runneradmin\talon.nvim
+      #   if: runner.os == 'Windows'
+      # - run: git clone https://github.com/vim-scripts/BufOnly.vim /Users/runner/BufOnly.vim
+      #   if: runner.os == 'macOS'
+      # - run: git clone https://github.com/hands-free-vim/talon.nvim /Users/runner/talon.nvim
+      #   if: runner.os == 'macOS'
       - name: Install Neovim
         uses: rhysd/action-setup-vim@v1
         id: vim
@@ -122,11 +110,11 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: logs
-          path: ${{ env.APP_LOGS_DIR }}
+          path: ${{ env.VSCODE_LOGS_DIR }}
         if: failure()
       - name: Archive dumps
         uses: actions/upload-artifact@v4
         with:
           name: dumps
-          path: ${{ env.APP_CRASH_DIR }}
+          path: ${{ env.VSCODE_CRASH_DIR }}
         if: failure()
diff --git a/packages/test-harness/src/launchNeovimAndRunTests.ts b/packages/test-harness/src/launchNeovimAndRunTests.ts
@@ -32,7 +32,7 @@ function delay(ms: number) {
  *  - Linux: /home/runner/work/cursorless/cursorless
  *  - OS X: /Users/runner/work/cursorless/cursorless
  */
-export async function launchNeovimAndRunTests(extensionTestsPath: string) {
+export async function launchNeovimAndRunTests(/*extensionTestsPath: string*/) {
   console.error(
     "CED: launchNeovimAndRunTests() (error to simulate always logging even if logging level is set to error)",
   );
@@ -45,8 +45,8 @@ export async function launchNeovimAndRunTests(extensionTestsPath: string) {
     //   "packages/cursorless-vscode/dist",
     // );
 
-    const crashDir = getEnvironmentVariableStrict("APP_CRASH_DIR");
-    const logsDir = getEnvironmentVariableStrict("APP_LOGS_DIR");
+    const crashDir = getEnvironmentVariableStrict("VSCODE_CRASH_DIR");
+    const logsDir = getEnvironmentVariableStrict("VSCODE_LOGS_DIR");
     const useLegacyVscode =
       getEnvironmentVariableStrict("APP_VERSION") === "legacy";
 

diff --git a/packages/test-harness/src/launchVscodeAndRunTests.ts b/packages/test-harness/src/launchVscodeAndRunTests.ts
@@ -27,8 +27,8 @@ export async function launchVscodeAndRunTests(extensionTestsPath: string) {
       "packages/cursorless-vscode/dist",
     );
 
-    const crashDir = getEnvironmentVariableStrict("APP_CRASH_DIR");
-    const logsDir = getEnvironmentVariableStrict("APP_LOGS_DIR");
+    const crashDir = getEnvironmentVariableStrict("VSCODE_CRASH_DIR");
+    const logsDir = getEnvironmentVariableStrict("VSCODE_LOGS_DIR");
     const useLegacyVscode =
       getEnvironmentVariableStrict("APP_VERSION") === "legacy";
 

diff --git a/packages/test-harness/src/scripts/runNeovimTestsCI.ts b/packages/test-harness/src/scripts/runNeovimTestsCI.ts
@@ -2,18 +2,18 @@
  * This file can be run from node to run neovim tests in CI
  */
 
-import { getCursorlessRepoRoot } from "@cursorless/common";
-import * as path from "path";
+// import { getCursorlessRepoRoot } from "@cursorless/common";
+// import * as path from "path";
 import { launchNeovimAndRunTests } from "../launchNeovimAndRunTests";
 
 (async () => {
   // Note that we run all extension tests, including unit tests, in neovim, even though
   // unit tests could be run separately.
-  const extensionTestsPath = path.resolve(
-    getCursorlessRepoRoot(),
-    // "packages/test-harness/dist/extensionTestsNeovim.cjs",
-    "packages/test-harness/out/index.cjs",
-  );
+  // const extensionTestsPath = path.resolve(
+  //   getCursorlessRepoRoot(),
+  //   // "packages/test-harness/dist/extensionTestsNeovim.cjs",
+  //   "packages/test-harness/out/index.cjs",
+  // );
 
-  await launchNeovimAndRunTests(extensionTestsPath);
+  await launchNeovimAndRunTests(/*extensionTestsPath*/);
 })();
diff --git a/scripts/install-neovim-dependencies.sh b/scripts/install-neovim-dependencies.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+echo CURSORLESS_REPO_ROOT=${CURSORLESS_REPO_ROOT}
+
+git clone https://github.com/vim-scripts/BufOnly.vim /home/runner/BufOnly.vim
+git clone https://github.com/hands-free-vim/talon.nvim /home/runner/talon.nvim