diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md deleted file mode 100644 index 2714bb61..00000000 --- a/.github/pull_request_template.md +++ /dev/null @@ -1,8 +0,0 @@ - - -Checklist: -- [ ] All tests pass in CI. -- [ ] There are sufficient tests for the new fix/feature. -- [ ] Grammar rules have not been renamed unless absolutely necessary. -- [ ] The conflicts section hasn't grown too much. -- [ ] The parser size hasn't grown too much (check the value of STATE_COUNT in src/parser.c). diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 08448036..359d2f4c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,30 +1,57 @@ name: CI + on: - workflow_dispatch: - pull_request: push: + branches: [master] + paths: + - grammar.js + - src/** + - test/** + - bindings/** + - binding.gyp + pull_request: + paths: + - grammar.js + - src/** + - test/** + - bindings/** + - binding.gyp + +concurrency: + group: ${{github.workflow}}-${{github.ref}} + cancel-in-progress: true jobs: test: - runs-on: ${{ matrix.os }} + name: Test parser + runs-on: ${{matrix.os}} strategy: - fail-fast: true + fail-fast: false matrix: - os: [macos-latest, ubuntu-latest] + os: [ubuntu-latest, windows-latest, macos-14] steps: - - uses: actions/checkout@v4 - - uses: actions/setup-node@v4 + - name: Checkout repository + uses: actions/checkout@v4 + - name: Set up tree-sitter + uses: tree-sitter/setup-action/cli@v1 + - name: Set up examples + run: | + git clone https://github.com/ruby/spec examples/ruby_spec --single-branch --depth=1 --filter=blob:none + - name: Run tests + uses: tree-sitter/parser-test-action@v2 with: - node-version: 18 - - run: npm install - - run: npm test - - test_windows: - runs-on: windows-latest - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-node@v4 + test-rust: ${{runner.os == 'Linux'}} + - name: Parse examples + uses: tree-sitter/parse-action@v4 with: - node-version: 18 - - run: npm install - - run: npm run test-windows + files: | + examples/*.rb + !examples/ruby_spec/command_line/fixtures/bad_syntax.rb + !examples/ruby_spec/command_line/fixtures/freeze_flag_required_diff_enc.rb + !examples/ruby_spec/core/enumerable/shared/inject.rb + !examples/ruby_spec/language/fixtures/freeze_magic_comment_required_diff_enc.rb + !examples/ruby_spec/language/string_spec.rb + !examples/ruby_spec/core/proc/ruby2_keywords_spec.rb + !examples/ruby_spec/language/fixtures/utf16-be-nobom.rb + !examples/ruby_spec/language/fixtures/utf16-le-nobom.rb + !examples/ruby_spec/language/lambda_spec.rb diff --git a/.github/workflows/fuzz.yml b/.github/workflows/fuzz.yml new file mode 100644 index 00000000..ad67d880 --- /dev/null +++ b/.github/workflows/fuzz.yml @@ -0,0 +1,19 @@ +name: Fuzz Parser + +on: + push: + branches: [master] + paths: + - src/scanner.c + pull_request: + paths: + - src/scanner.c + +jobs: + fuzz: + runs-on: ubuntu-latest + steps: + - name: Checkout repository + uses: actions/checkout@v4 + - name: Run fuzzer + uses: tree-sitter/fuzz-action@v4 diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 103e92ae..96f1a4df 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -2,18 +2,25 @@ name: Lint on: push: - branches: - - master + branches: [master] + paths: + - grammar.js pull_request: - branches: - - "**" + paths: + - grammar.js jobs: lint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - name: Checkout repository + uses: actions/checkout@v4 + - name: Set up Node.js + uses: actions/setup-node@v4 + with: + cache: npm + node-version: ${{vars.NODE_VERSION}} - name: Install modules - run: npm install + run: npm ci --legacy-peer-deps - name: Run ESLint run: npm run lint diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml new file mode 100644 index 00000000..cb7e16b8 --- /dev/null +++ b/.github/workflows/publish.yml @@ -0,0 +1,23 @@ +name: Publish packages + +on: + push: + tags: ["*"] + +concurrency: + group: ${{github.workflow}}-${{github.ref}} + cancel-in-progress: true + +jobs: + npm: + uses: tree-sitter/workflows/.github/workflows/package-npm.yml@main + secrets: + NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}} + crates: + uses: tree-sitter/workflows/.github/workflows/package-crates.yml@main + secrets: + CARGO_REGISTRY_TOKEN: ${{secrets.CARGO_REGISTRY_TOKEN}} + pypi: + uses: tree-sitter/workflows/.github/workflows/package-pypi.yml@main + secrets: + PYPI_API_TOKEN: ${{secrets.PYPI_API_TOKEN}} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml deleted file mode 100644 index 870eb84b..00000000 --- a/.github/workflows/release.yml +++ /dev/null @@ -1,103 +0,0 @@ -name: Release - -on: - workflow_run: - workflows: ["CI"] - branches: - - master - types: - - completed - -jobs: - release: - runs-on: ubuntu-latest - steps: - - name: Checkout code - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - - name: Get previous commit SHA - id: get_previous_commit - run: | - LATEST_TAG=$(git describe --tags --abbrev=0) - if [[ -z "$LATEST_TAG" ]]; then - echo "No tag found. Failing..." - exit 1 - fi - echo "latest_tag=${LATEST_TAG#v}" >> "$GITHUB_ENV" # Remove 'v' prefix from the tag - - - name: Check if version changed and is greater than the previous - id: version_check - run: | - # Compare the current version with the version from the previous commit - PREVIOUS_NPM_VERSION=${{ env.latest_tag }} - CURRENT_NPM_VERSION=$(jq -r '.version' package.json) - CURRENT_CARGO_VERSION=$(awk -F '"' '/^version/ {print $2}' Cargo.toml) - if [[ "$CURRENT_NPM_VERSION" != "$CURRENT_CARGO_VERSION" ]]; then # Cargo.toml and package.json versions must match - echo "Mismatch: NPM version ($CURRENT_NPM_VERSION) and Cargo.toml version ($CURRENT_CARGO_VERSION)" - echo "version_changed=false" >> "$GITHUB_ENV" - else - if [[ "$PREVIOUS_NPM_VERSION" == "$CURRENT_NPM_VERSION" ]]; then - echo "version_changed=" >> "$GITHUB_ENV" - else - IFS='.' read -ra PREVIOUS_VERSION_PARTS <<< "$PREVIOUS_NPM_VERSION" - IFS='.' read -ra CURRENT_VERSION_PARTS <<< "$CURRENT_NPM_VERSION" - VERSION_CHANGED=false - for i in "${!PREVIOUS_VERSION_PARTS[@]}"; do - if [[ ${CURRENT_VERSION_PARTS[i]} -gt ${PREVIOUS_VERSION_PARTS[i]} ]]; then - VERSION_CHANGED=true - break - elif [[ ${CURRENT_VERSION_PARTS[i]} -lt ${PREVIOUS_VERSION_PARTS[i]} ]]; then - break - fi - done - - echo "version_changed=$VERSION_CHANGED" >> "$GITHUB_ENV" - echo "current_version=${CURRENT_NPM_VERSION}" >> "$GITHUB_ENV" - fi - fi - - - name: Display result - run: | - echo "Version bump detected: ${{ env.version_changed }}" - - - name: Fail if version is lower - if: env.version_changed == 'false' - run: exit 1 - - - name: Setup Node - if: env.version_changed == 'true' - uses: actions/setup-node@v4 - with: - node-version: 18 - registry-url: "https://registry.npmjs.org" - - name: Publish to NPM - if: env.version_changed == 'true' - env: - NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}} - run: npm publish - - - name: Setup Rust - if: env.version_changed == 'true' - uses: actions-rs/toolchain@v1 - with: - profile: minimal - toolchain: stable - override: true - - name: Publish to Crates.io - if: env.version_changed == 'true' - uses: katyo/publish-crates@v2 - with: - registry-token: ${{ secrets.CARGO_REGISTRY_TOKEN }} - - - name: Tag versions - if: env.version_changed == 'true' - run: | - git checkout master - git config user.name github-actions[bot] - git config user.email github-actions[bot]@users.noreply.github.com - git tag -d "v${{ env.current_version }}" || true - git push origin --delete "v${{ env.current_version }}" || true - git tag -a "v${{ env.current_version }}" -m "Version ${{ env.current_version }}" - git push origin "v${{ env.current_version }}" diff --git a/script/known_failures.txt b/script/known_failures.txt deleted file mode 100644 index 9d3bcb3d..00000000 --- a/script/known_failures.txt +++ /dev/null @@ -1,9 +0,0 @@ -examples/ruby_spec/command_line/fixtures/bad_syntax.rb -examples/ruby_spec/command_line/fixtures/freeze_flag_required_diff_enc.rb -examples/ruby_spec/core/enumerable/shared/inject.rb -examples/ruby_spec/language/fixtures/freeze_magic_comment_required_diff_enc.rb -examples/ruby_spec/language/string_spec.rb -examples/ruby_spec/core/proc/ruby2_keywords_spec.rb -examples/ruby_spec/language/fixtures/utf16-be-nobom.rb -examples/ruby_spec/language/fixtures/utf16-le-nobom.rb -examples/ruby_spec/language/lambda_spec.rb diff --git a/script/parse-examples b/script/parse-examples deleted file mode 100755 index 3080c53e..00000000 --- a/script/parse-examples +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash - -set -e - -cd "$(dirname "$0")/.." - -function checkout_at() { - repo=$1; url=$2; sha=$3 - if [ ! -d "$repo" ]; then - git clone "https://github.com/$url" "$repo" - fi - - pushd "$repo" - git fetch && git reset --hard "$sha" - popd -} - -checkout_at "examples/ruby_spec" "ruby/spec" "aaf998fb8c92c4e63ad423a2e7ca6e6921818c6e" - -# TODO: Fix these known issues: -# - [ ] String literals delimited with `=`, e.g. `%=hi=` -# - [ ] Issue with << operator mistaken for heredocs, e.g. `send(@method){|r,i| r< a: { }` -# - [ ] Lambda with call as default argument `-> a=a() { a }` -known_failures="$(cat script/known_failures.txt)" - -node_modules/tree-sitter-cli/cli.js parse -q \ - 'examples/**/*.rb' \ - $(for file in $known_failures; do echo "!${file}"; done) - -example_count=$(find examples -name '*.rb' | wc -l) -failure_count=$(wc -w <<< "$known_failures") -success_count=$(( $example_count - $failure_count )) -success_percent=$(bc -l <<< "100*${success_count}/${example_count}") - -printf \ - "Successfully parsed %d of %d example files (%.1f%%)\n" \ - $success_count $example_count $success_percent