diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4d2234bb..206db65a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -5,27 +5,26 @@ name: Node.js CI on: push: - branches: [ main ] + branches: [main, develop] pull_request: {} jobs: test: - runs-on: ${{ matrix.os }} strategy: matrix: - node-version: [10.x, 12.x, 14.x] - os: [macos-latest, ubuntu-latest] + node-version: [18.x, 20.x, 22.x] + os: [macos-latest, ubuntu-latest, windows-latest] steps: - - uses: actions/checkout@v2 - - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v1 - with: - node-version: ${{ matrix.node-version }} - - run: npm ci - - run: xvfb-run -a npm test - if: runner.os == 'Linux' - - run: npm test - if: runner.os != 'Linux' + - uses: actions/checkout@v4 + - name: Use Node.js ${{ matrix.node-version }} + uses: volta-cli/action@v4 + with: + node-version: ${{ matrix.node-version }} + - run: npm ci + - run: xvfb-run -a npm test + if: runner.os == 'Linux' + - run: npm test + if: runner.os != 'Linux' diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index c38da7b1..00000000 --- a/appveyor.yml +++ /dev/null @@ -1,27 +0,0 @@ -environment: - ELECTRON_RUN_AS_NODE: 1 - VSCODE_BUILD_VERBOSE: true - -platform: - - x86 - - x64 - -install: - - ps: Install-Product node 8 - - npm install - -cache: - - node_modules - - "%APPDATA%\\npm-cache" - -test_script: - - node --version - - npm --version - - npm run lint - - npm run vscode:prepublish - - npm run test --silent -# - .\scripts\test.bat -# - .\scripts\test-integration.bat - -# Don't actually build. -build: off diff --git a/package.json b/package.json index cad4c572..79788b75 100644 --- a/package.json +++ b/package.json @@ -185,7 +185,7 @@ "vscode:prepublish": "tsc -p ./", "compile": "tsc -watch -p ./", "lint": "eslint .", - "test": "npm run vscode:prepublish; node ./out/test/runTest.js" + "test": "npm run vscode:prepublish && node ./out/test/runTest.js" }, "devDependencies": { "@types/chai": "5.0.0",