Merge pull request #190 from emacs-tree-sitter/compilation-utilities

Compilation Utilities

Author: ubolonton

.github/workflows/integ.yml

@@ -9,7 +9,6 @@ on:
 
 jobs:
   integ:
-    needs: publish-binaries
     strategy:
       fail-fast: false
       matrix:

.github/workflows/release.yml

@@ -96,7 +96,7 @@ jobs:
           path: core/tsc-dyn.*${{ matrix.ext }}
           if-no-files-found: error
 
-  publish:
+  publish-binaries:
     needs: build
     runs-on: ubuntu-18.04
     steps:
@@ -122,3 +122,64 @@ jobs:
           body_path: RELEASE-NOTES
           files: |
             tsc-dyn.*
+
+  integ:
+    needs: publish-binaries
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: macos-10.15
+            emacs-version: '27.2'
+          - os: ubuntu-18.04
+            emacs-version: '27.2'
+          # XXX: Fails on CI, but not locally (Windows 10) with
+          # :value 2 :fail-reason "did not signal an error"
+          # and
+          # (different-types 443 (tsc . 1))
+          #
+          # - os: windows-2019
+          #   emacs-version: '27.2'
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: purcell/setup-emacs@v3.0
+        if: runner.os != 'Windows'
+        with:
+          version: ${{ matrix.emacs-version }}
+      - uses: jcs090218/setup-emacs-windows@v4
+        if: runner.os == 'Windows'
+        with:
+          version: ${{ matrix.emacs-version }}
+
+      - uses: actions/checkout@v2
+
+      - run: .github/script/setup-cask
+      - run: bin/setup
+
+      - run: bin/test integ
+
+  publish-melpa:
+    needs: integ
+    runs-on: ubuntu-18.04
+    steps:
+      - name: Set release version
+        run: |
+          echo "RELEASE_VERSION=$(git describe --tags --abbrev=0)" >> $GITHUB_ENV
+
+      - name: Greenlight releasing to MELPA
+        run: |
+          git push origin ${{ env.RELEASE_VERSION }}:refs/heads/release
+        continue-on-error: true
+
+      # We don't want this to trigger workflows, so we don't use a personal access token.
+      - name: Greenlight releasing to MELPA Stable
+        uses: actions/github-script@v4
+        with:
+          script: |
+            github.git.createRef({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              ref: "refs/tags/melpa-stable/v${{ env.RELEASE_VERSION }}",
+              sha: context.sha
+            })
+        continue-on-error: true

CHANGELOG.md

@@ -4,6 +4,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## [Unreleased]
+- Added customization option `tsc-dyn-get-from`, which is a list of sources to get the dynamic module `tsc-dyn` from. Its default value is `(:github :compilation)`.
 
 ## [0.16.1] - 2021-12-11
 - Modified CI pipelines to publish additional pre-built dynamic modules. Their filenames include the platform they are built for. The files without platform in name will eventually be deprecated.

Cask

@@ -5,4 +5,5 @@
 (source melpa)
 
 (development
- (depends-on "rust-mode"))
+ (depends-on "rust-mode")
+ (depends-on "async"))

bin/build

@@ -71,7 +71,7 @@ echo "!! Building the dynamic module"
 
     cp -f "$target_dir/$profile_/$MODULE_ORIGINAL" "$MODULE_RENAMED"
     version=$(cargo pkgid | cut -d'#' -f2 | cut -d: -f2)
-    echo "$version".1 | tr -d $'\n' > DYN-VERSION
+    echo "$version" | tr -d $'\n' > DYN-VERSION
 )
 
 echo "!! Building Lisp code"

bin/test

@@ -12,14 +12,20 @@ if [[ $* == "watch" ]]; then
         cargo watch -s ../bin/build -s ../bin/test
     )
 else
+    if [[ $* == "integ" ]]; then
+        test_mod="tsc-dyn-get-tests.el"
+    else
+        test_mod="tree-sitter-tests.el"
+    fi
     (
         cd "$PROJECT_ROOT"
         cask emacs --batch \
              --directory "$PROJECT_ROOT/core" \
              --directory "$PROJECT_ROOT/lisp" \
              --directory "$PROJECT_ROOT/langs" \
+             --directory "$PROJECT_ROOT/tests" \
              -l ert \
-             -l tree-sitter-tests.el \
+             -l "$test_mod" \
              -f ert-run-tests-batch-and-exit
     )
 fi

bin/test.ps1

@@ -9,6 +9,11 @@ if ($args[0] -eq "watch") {
         Pop-Location
     }
 } else {
+    if ($args[0] -eq "integ") {
+        $test_mod = "tsc-dyn-get-tests.el"
+    } else {
+        $test_mod = "tree-sitter-tests.el"
+    }
     # XXX: It seems that Emacs writes to stderr, so PowerShell thinks it's an error. Redirecting to
     # stdout alone doesn't help, because it's the processed stderr, which contain error records, not
     # the original stderr. Piping at the end to convert these error records into strings doesn't
@@ -29,8 +34,9 @@ if ($args[0] -eq "watch") {
           --directory "$project_root\core" `
           --directory "$project_root\lisp" `
           --directory "$project_root\langs" `
+          --directory "$project_root\tests" `
           -l ert `
-          -l tree-sitter-tests.el `
+          -l "$test_mod" `
           -f ert-run-tests-batch-and-exit
     } finally {
         Pop-Location