.github/workflows/node.js.yml

@@ -0,0 +1,23 @@
+name: Node.js CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Use Node.js 16.x
+      uses: actions/setup-node@v2
+      with:
+        node-version: 16.x
+        cache: 'npm'
+    - run: npm ci
+    - run: npm run build --if-present
+    - run: npm test

README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/angular/clang-format.svg?branch=master)](https://travis-ci.org/angular/clang-format)
+[![Build Status](https://github.com/angular/clang-format/actions/workflows/node.js.yml/badge.svg)](https://github.com/angular/clang-format/actions/workflows/node.js.yml)
 
 # clang-format
 node.js module which wraps the native clang-format executable.
@@ -15,8 +15,10 @@ the latest upstream clang sources, make sure it is stripped and optimized
 ## Checking formatting
 
 Ensuring that changes to your code are properly formatted is an important part
-of your development workflow. We recommend using a git pre-commit hook. You can
-configure this as follows:
+of your development workflow. Note that the `check-clang-format` and
+`git-clang-format` commands require Python to be globally available.
+
+We recommend using a git pre-commit hook. You can configure this as follows:
 
 1. add a `precommit` script to your package.json file:
 
@@ -68,8 +70,13 @@ See [node-glob](https://github.com/isaacs/node-glob) for globbing semantics.
 
 For Linux, compile a statically linked MinSizeRel build:
 
-    cmake -G Ninja -DCMAKE_BUILD_TYPE=MinSizeRel -DLLVM_BUILD_STATIC=true ..
+    git clone --depth=1 https://github.com/llvm/llvm-project.git
+    cd llvm-project
+    mkdir build
+    cd build
+    cmake -G Ninja -DCMAKE_BUILD_TYPE=MinSizeRel -DLLVM_BUILD_STATIC=true -DLLVM_ENABLE_PROJECTS=clang ../llvm
     ninja clang-format
+    strip bin/clang-format
 
 For Mac OS X, static linking is not required.
 

bin/check-clang-format.js

@@ -13,17 +13,24 @@
 const spawn = require('child_process').spawnSync;
 const path = require('path');
 
+function getPythonInterpreter() {
+  const interpreterOptions = ['python3', 'python', 'python2'];
+  for (const opt of interpreterOptions) {
+    const result = spawn(opt, ['--version'], {encoding: 'utf-8'});
+    if (result.status === 0) {
+      return opt;
+    }
+  }
+  return null;
+}
+
 function checkGitConfig() {
   const spawn_opts = {encoding: 'utf-8', stdio: ['pipe', 'pipe', 'inherit']};
-  const binary =
-      spawn('git', ['config', '--get', 'clangFormat.binary'], spawn_opts)
-          .stdout.trim();
-  const style =
-      spawn('git', ['config', '--get', 'clangFormat.style'], spawn_opts)
-          .stdout.trim();
-  var gitConfigWrong = false;
+  const binary = spawn('git', ['config', '--get', 'clangFormat.binary'], spawn_opts).stdout.trim();
+  const style = spawn('git', ['config', '--get', 'clangFormat.style'], spawn_opts).stdout.trim();
+  let gitConfigWrong = false;
 
-  if (binary !== 'node_modules/.bin/clang-format') {
+  if (binary.indexOf(`node_modules${path.sep}.bin${path.sep}clang-format`) === -1) {
     console.error(`
       ERROR: Found git config --get clangFormat.binary = "${binary}"
       This can result in running a different version of clang-format than your
@@ -47,21 +54,30 @@ function checkGitConfig() {
 }
 
 function main(args) {
+  let clangFormatPath;
+  let configCheck;
+
+  const interpreter = getPythonInterpreter();
+  if (interpreter === null) {
+    console.error('No python interpreter found');
+    return 2;
+  }
+
   try {
-    var clangFormatPath = path.dirname(require.resolve('clang-format'));
-    var configCheck = checkGitConfig();
+    clangFormatPath = path.dirname(require.resolve('clang-format'));
+    configCheck = checkGitConfig();
 
     if (configCheck !== 0) return configCheck;
   } catch (e) {
     // When running the git-clang-format on ourselves, it's located in a
     // different place
-    var clangFormatPath = '.';
+    clangFormatPath = '.';
     // And we don't run the configCheck, because the clang-format binary is also
     // in a different place
   }
 
   const gitClangFormatPath = path.join(clangFormatPath, 'bin/git-clang-format');
-  const result = spawn(gitClangFormatPath, ['--diff'], {encoding: 'utf-8'});
+  const result = spawn(interpreter, [gitClangFormatPath, '--diff'], {encoding: 'utf-8'});
 
   if (result.error) {
     console.error('Error running git-clang-format:', result.error);