diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c049ed9f..b5c29653 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,4 +1,4 @@ -name: Build & Test +name: Build/test on: push: branches: @@ -7,16 +7,29 @@ on: branches: - master jobs: - build-and-test: + test: runs-on: ${{ matrix.os }} strategy: + fail-fast: true matrix: - os: [windows-latest, ubuntu-latest, macos-latest] - fail-fast: false + os: [macos-latest, ubuntu-latest] steps: - - uses: actions/checkout@v2 - - uses: actions/setup-node@v2 + - uses: actions/checkout@v3 with: - node-version: 14 + submodules: true + - uses: actions/setup-node@v3 + with: + node-version: 16 + - run: npm install + - run: npm test + test_windows: + runs-on: windows-latest + steps: + - uses: actions/checkout@v3 + with: + submodules: true + - uses: actions/setup-node@v3 + with: + node-version: 16 - run: npm install - - run: node_modules/.bin/tree-sitter test + - run: npm run-script test-windows diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 1a740cf7..00000000 --- a/.travis.yml +++ /dev/null @@ -1,34 +0,0 @@ -language: node_js - -sudo: false - -node_js: -- node - -os: -- linux - -matrix: - include: - - os: osx - env: COMPILER=clang++ - osx_image: xcode9.2 - compiler: clang - - os: linux - -branches: - only: - - master - - /^v.*$/ - -deploy: - provider: script - script: npm run pre-build && npm run pre-build:upload -u ${PREBUILD_UPLOAD} - skip_cleanup: true - on: - all_branches: true - tags: true - -env: - global: - secure: jAdfI37gohXm5VvR5h2AoWVwUMS9hUPxZIP4VR2iOkTSZLaaZczvL04IRNv3bQY6WUYxcVB6xoKbOPMKE1cHvXM8L2W6G1InPxU14P6fKd2MGWxH6PWmCoXHWFQ1AzWkYsMgMokHT2vs4iZ2bLHE9uV3RVuAISO/APsw7AxEpEijljvPkL+Se0nTnCfTbw4ObGxEMRW7TnjKa2W7K8m4QbbGd+r9CzCxBakjdIePQx81IUAAIGwphkY/avNJeUvR1XLnAM38K9Yj0ioSfeV6/QshK/28DLmvilq9sV4LDLVlhgP6h1FB4HW3PEVvYWnWBKa9cUdIAIncya2ibvu2cRHYVbud4Ho6lMCk/QUuiPYLCfnOfa4byVj3DInOY1yCpu+YnqjVOUHV5wQLEvnArLCuJa7dlJSmYquzVr5NkOz9gMmFAyuznL3YdJYY98QH/5GO5FwE8jXiYMoQ+hW52gUB6vZaJqYJu+IwyEhVXj8SVyV3Z77fFmJpdo0FX8R4Mm/3ucVXfWAXifFQbosRM4czVJ3RNTn2Xwf5Vp0ayih4huhwB9reByNPnYJABNUQpiAS3ZRsd+fcmMstkHZOk9EpSq33kubqcN+kub3sGNOJTt9243FOd6BghNNjhC2lqTWZsefyJUuL3Xm5YjJrJWfyif6RPnJZHinn3jfn464= diff --git a/appveyor.yml b/appveyor.yml index 708a4768..8c705a9c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,7 +1,7 @@ image: Visual Studio 2015 environment: - NODEJS_VERSION: "8" + NODEJS_VERSION: "16" PREBUILD_UPLOAD: secure: oNyyLE7/Oq3TUGZPz6DkLFPUuQzc8FiFS1iuPp7LZ2fyOP/UF4Np4NzJmWcXVyY/ diff --git a/package.json b/package.json index 9e719bce..509107df 100644 --- a/package.json +++ b/package.json @@ -10,18 +10,15 @@ "author": "Max Brunsfeld", "license": "MIT", "dependencies": { - "nan": "^2.14.0", - "prebuild-install": "^5.3.3" + "nan": "^2.17.0" }, "devDependencies": { - "prebuild": "^10.0.0", - "tree-sitter-cli": "^0.19.1" + "tree-sitter-cli": "^0.20.7" }, "scripts": { - "install": "prebuild-install || node-gyp rebuild", - "pre-build": "prebuild --all --strip --verbose", - "pre-build:upload": "prebuild --upload-all", - "test": "tree-sitter test && script/parse-examples.sh", + "build": "tree-sitter generate && node-gyp build", + "parse": "tree-sitter parse", + "test": "tree-sitter test && script/parse-examples", "test-windows": "tree-sitter test" }, "repository": "https://github.com/tree-sitter/tree-sitter-bash", diff --git a/script/parse-examples.sh b/script/parse-examples similarity index 100% rename from script/parse-examples.sh rename to script/parse-examples