From 8719d78bc69bdeb323303531f26e220029e8c208 Mon Sep 17 00:00:00 2001
From: Michael Ernst <mernst@cs.washington.edu>
Date: Fri, 7 Aug 2026 21:06:10 -0700
Subject: [PATCH 1/2] Update linting settings

---
 .circleci/config.yml |  2 +-
 prek.toml            | 34 ++++++++++++++++++++++++----------
 2 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index c53443f..b2c5785 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -2,7 +2,7 @@ version: 2.1
 jobs:
   prek:
     docker:
-      - image: cimg/python:3.14
+      - image: cimg/python:3.11
     steps:
       - checkout
       - run:
diff --git a/prek.toml b/prek.toml
index a82f1cd..3ef5beb 100644
--- a/prek.toml
+++ b/prek.toml
@@ -18,9 +18,11 @@ exclude = { glob = [
   "**/*.ps",
   "**/*.ps-*",
   "**/*.svg",
-  "**/COPYING",
   "**/*expected*",
+  "**/COPYING",
   "src/main/resources/specifications/jdk/*",
+  "src/test/resources/end-to-end/**/*",
+  "tests/kvasir-tests/povray/*",
 ] }
 
 [[repos]]
@@ -36,9 +38,7 @@ hooks = [
   ] } },
   { id = "check-json" },
   { id = "check-merge-conflict" },
-  { id = "check-shebang-scripts-are-executable", exclude = { glob = [
-    "tests/kvasir-tests/povray/source/**",
-  ] } },
+  { id = "check-shebang-scripts-are-executable" },
   { id = "check-symlinks", exclude = { glob = [
     ".subversion/auth",
     "dots/.subversion/auth",
@@ -59,7 +59,6 @@ hooks = [
     "**/tests/squeeze-blank-lines-test/**",
     "bugs/jikes-patches/*",
     "java/jtb/**",
-    "src/main/resources/specifications/jdk",
     "tests/kvasir-tests/**",
   ] } },
   { id = "file-contents-sorter", files = { glob = [
@@ -87,6 +86,17 @@ hooks = [
   ] } },
 ]
 
+## CircleCI
+
+# This doesn't install the tool!  It fails with "Circleci CLI could not be
+# found." unless you have installed the CircleCI CLI.  Using `snap` to install
+# leads to permission problems due to snap confinement.  To install:
+# - run: curl -fLSs https://raw.githubusercontent.com/CircleCI-Public/circleci-cli/main/install.sh | sudo bash
+[[repos]]
+repo = "https://github.com/zahorniak/pre-commit-circleci"
+rev = "v1.3.0"
+hooks = [{ id = "circleci_validate" }]
+
 ## GitHub Actions
 
 [[repos]]
@@ -105,6 +115,8 @@ hooks = [
     "**/pubs-bytopic-headfoot.html",
     "**/pubs-bytopic-underreview-headfoot.html",
     "google04aaa4eb05fd668b.html",
+    "pubs/*-abstract.html",
+    "pubs/index.html",
     "tests/sources/six170/huffman.html",
     "tools/hierarchical/clustering.html",
   ] } },
@@ -117,13 +129,16 @@ hooks = [
 [[repos]]
 repo = "local"
 hooks = [
-  { id = "gradle-spotless", name = "spotless formatting", language = "unsupported", entry = "bash -c 'if [ -f ./gradlew ] ; then ./gradlew spotlessApply; fi'", files = "\\.java$", pass_filenames = false },
+  { id = "gradle-spotless", name = "spotless formatting", language = "unsupported", entry = "bash -c 'if [ -f ./gradlew ] ; then ./gradlew spotlessApply; fi'", files = { glob = [
+    "**/*.java",
+    "**/*.gradle.kts",
+  ] }, pass_filenames = false },
 ]
 
 ## Makefiles
 
 [[repos]]
-repo = "https://github.com/checkmake/checkmake.git"
+repo = "https://github.com/checkmake/checkmake"
 rev = "0.2.2"
 hooks = [
   { id = "checkmake", args = [
@@ -214,7 +229,6 @@ hooks = [
     "tests/kvasir-tests/tot_info/tests.sh",
     "cronic-orig",
     "classfile_check_version",
-    "tests/kvasir-tests/povray/**/*",
   ] } },
 ]
 
@@ -321,6 +335,6 @@ hooks = [
 ]
 
 [[repos]]
-repo = "https://github.com/adrienverge/yamllint.git"
-rev = "v1.29.0"
+repo = "https://github.com/adrienverge/yamllint"
+rev = "v1.38.0"
 hooks = [{ id = "yamllint" }]

From 8915ad3d74f1fca166f0a0eb731d257daee94697 Mon Sep 17 00:00:00 2001
From: Michael Ernst <mernst@cs.washington.edu>
Date: Fri, 7 Aug 2026 21:42:57 -0700
Subject: [PATCH 2/2] Install CircleCI CLI

---
 .circleci/config.yml        | 2 +-
 .github/workflows/prek.yaml | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b2c5785..c53443f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -2,7 +2,7 @@ version: 2.1
 jobs:
   prek:
     docker:
-      - image: cimg/python:3.11
+      - image: cimg/python:3.14
     steps:
       - checkout
       - run:
diff --git a/.github/workflows/prek.yaml b/.github/workflows/prek.yaml
index 7c10ca2..2bbbe5f 100644
--- a/.github/workflows/prek.yaml
+++ b/.github/workflows/prek.yaml
@@ -6,4 +6,5 @@ jobs:
     timeout-minutes: 10
     steps:
       - uses: actions/checkout@v7
+      - run: curl -fLSs https://raw.githubusercontent.com/CircleCI-Public/circleci-cli/main/install.sh | sudo bash
       - uses: j178/prek-action@v3.0.0