From fc6228834b110c2993d4ece7b4c9c6430f46ac3a Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Mon, 22 Jun 2026 15:46:29 +0200
Subject: [PATCH 1/7] .clang-format: match fish_test_helper style

---
 .clang-format | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.clang-format b/.clang-format
index d154da600f44..52b15eb7baa1 100644
--- a/.clang-format
+++ b/.clang-format
@@ -2,7 +2,12 @@
 #
 # 1) lines can be up to 100 chars long rather than 80, and
 # 2) use a four space indent rather than two spaces.
+# 3) for C files, put * on the right.
 #
-BasedOnStyle: Google
+---
+Language: C
+BasedOnStyle: LLVM
 ColumnLimit: 100
 IndentWidth: 4
+PointerAlignment: Right
+---

From 7d2451efa254cb965be01f48c51843bee320a283 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Mon, 22 Jun 2026 15:46:29 +0200
Subject: [PATCH 2/7] build_tools/update-dependencies.sh: sort

---
 build_tools/update-dependencies.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/build_tools/update-dependencies.sh b/build_tools/update-dependencies.sh
index cb8a6118923e..8619a18296d7 100755
--- a/build_tools/update-dependencies.sh
+++ b/build_tools/update-dependencies.sh
@@ -22,17 +22,18 @@ update_gh_action() {
         sed -i "s|uses: $repo@\S\+\( \+#.*\)\?|\
 uses: $repo@$tag_oid # $version, build_tools/update-dependencies.sh|g" {} +
 }
+
 update_gh_action actions/checkout
+update_gh_action actions/download-artifact
 update_gh_action actions/github-script
 update_gh_action actions/upload-artifact
-update_gh_action actions/download-artifact
-update_gh_action docker/login-action
+update_gh_action dessant/lock-threads
 update_gh_action docker/build-push-action
+update_gh_action docker/login-action
 update_gh_action docker/metadata-action
 update_gh_action EmbarkStudios/cargo-deny-action
-update_gh_action dessant/lock-threads
-update_gh_action softprops/action-gh-release
 update_gh_action msys2/setup-msys2
+update_gh_action softprops/action-gh-release
 
 updatecli "${@:-apply}"
 

From 899503ded5836230e6e5d540851bded996c85562 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Mon, 22 Jun 2026 16:08:27 +0200
Subject: [PATCH 3/7] install-dependencies: remove redundant pcre2/gettext
 install cmds

---
 .github/actions/install-dependencies/action.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/actions/install-dependencies/action.yml b/.github/actions/install-dependencies/action.yml
index 8a4d68cbea71..3ce6495dcb5a 100644
--- a/.github/actions/install-dependencies/action.yml
+++ b/.github/actions/install-dependencies/action.yml
@@ -30,9 +30,7 @@ runs:
         sudo apt install \
           diffutils $(: "for diff") \
           git \
-          gettext \
           less \
-          $(if ${{ inputs.include_pcre }}; then echo libpcre2-dev; fi) \
           python3-pexpect \
           tmux \
           wget \

From 6071fe46d95fe84dc8212baff59c7d8c9eacbb62 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Mon, 22 Jun 2026 15:46:29 +0200
Subject: [PATCH 4/7] docker: remove unused packages cmake/ninja

---
 docker/ubuntu-latest-lts.Dockerfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docker/ubuntu-latest-lts.Dockerfile b/docker/ubuntu-latest-lts.Dockerfile
index e5a93ffae62a..005731a7e082 100644
--- a/docker/ubuntu-latest-lts.Dockerfile
+++ b/docker/ubuntu-latest-lts.Dockerfile
@@ -7,7 +7,6 @@ ENV LC_ALL=C.UTF-8
 
 RUN apt-get update \
     && apt-get -y install --no-install-recommends  \
-        cmake ninja-build \
         build-essential \
         ca-certificates \
         clang \

From 61e0bb2a29a68b31354da0936d36085d6813c75b Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Mon, 22 Jun 2026 15:46:29 +0200
Subject: [PATCH 5/7] tests/checks/cd: reformat

---
 tests/checks/cd.fish | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tests/checks/cd.fish b/tests/checks/cd.fish
index 68df7c020ac1..2213e1fe9088 100644
--- a/tests/checks/cd.fish
+++ b/tests/checks/cd.fish
@@ -364,7 +364,11 @@ complete -C'cd .'
 # NetBSD 10 does not support it.
 # Cygwin/MSYS does not support it when using ACL. And without ACL, a directory
 # cannot be made unreadable, making the test pointless. So either way, skip it
-if test (uname) = NetBSD || __fish_is_cygwin || { test (uname) = Darwin && test (sysctl kern.osproductversion 2>/dev/null | string match -r \\d+; or echo 10) -lt 12 }
+if test (uname) = NetBSD || __fish_is_cygwin ||
+    { test (uname) = Darwin &&
+        test \
+        (sysctl kern.osproductversion 2>/dev/null | string match -r \\d+; or echo 10) \
+        -lt 12 }
     # Not supported. Satisfy the CHECKs below.
     echo fake/a
     echo fake/a/b

From 78333e71c7551b82d34749d90d00a25f2e2465cf Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Tue, 23 Jun 2026 09:54:31 +0200
Subject: [PATCH 6/7] build_tools/update-dependencies.sh: fail on unused
 workflow

---
 build_tools/update-dependencies.sh | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/build_tools/update-dependencies.sh b/build_tools/update-dependencies.sh
index 8619a18296d7..e2505e3146aa 100755
--- a/build_tools/update-dependencies.sh
+++ b/build_tools/update-dependencies.sh
@@ -18,9 +18,13 @@ update_gh_action() {
     [ -n "$version" ]
     tag_oid=$(git ls-remote "https://github.com/$repo.git" "refs/tags/$version" | cut -f1)
     [ -n "$tag_oid" ]
-    find .github/workflows -name '*.yml' -type f -exec \
-        sed -i "s|uses: $repo@\S\+\( \+#.*\)\?|\
-uses: $repo@$tag_oid # $version, build_tools/update-dependencies.sh|g" {} +
+    workflow_files=$(find .github/workflows -name '*.yml' -type f)
+    # shellcheck disable=2086
+    grep "\buses: $repo@\S\+\( \+#.*\)\?" $workflow_files
+    # shellcheck disable=2086
+    sed -i "s|\buses: $repo@\S\+\( \+#.*\)\?|\
+uses: $repo@$tag_oid # $version, build_tools/update-dependencies.sh|g" \
+        $workflow_files
 }
 
 update_gh_action actions/checkout
@@ -28,9 +32,6 @@ update_gh_action actions/download-artifact
 update_gh_action actions/github-script
 update_gh_action actions/upload-artifact
 update_gh_action dessant/lock-threads
-update_gh_action docker/build-push-action
-update_gh_action docker/login-action
-update_gh_action docker/metadata-action
 update_gh_action EmbarkStudios/cargo-deny-action
 update_gh_action msys2/setup-msys2
 update_gh_action softprops/action-gh-release

From 7e6a465b8d7f6f8be710ed99cac6d9e5dc0d69b0 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Tue, 23 Jun 2026 09:54:31 +0200
Subject: [PATCH 7/7] docker/docker_run_tests.sh: use consistent variable name

We use this name in other scripts and Rust code.
---
 docker/docker_run_tests.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docker/docker_run_tests.sh b/docker/docker_run_tests.sh
index d531c3ec3f15..5ed7f0d26d26 100755
--- a/docker/docker_run_tests.sh
+++ b/docker/docker_run_tests.sh
@@ -19,7 +19,7 @@ export DOCKER_BUILDKIT=1
 set -e
 
 # Get fish source directory.
-FISH_SRC_DIR=$(cd "$( dirname "$0" )"/.. >/dev/null && pwd)
+workspace_root=$(cd "$( dirname "$0" )"/.. >/dev/null && pwd)
 
 # Parse args.
 while [ $# -gt 1 ]; do
@@ -51,11 +51,11 @@ IMG_TAGNAME="ghcr.io/fish-shell/fish-ci/$(basename -s .Dockerfile "$DOCKERFILE")
 docker build \
     -t "$IMG_TAGNAME" \
     -f "$DOCKERFILE" \
-    "$FISH_SRC_DIR"/docker/context/
+    "$workspace_root"/docker/context/
 
 # Run tests in it, allowing them to fail without failing this script.
 # shellcheck disable=SC2086  # $DOCKER_EXTRA_ARGS should have globbing and splitting applied.
 docker run -it \
-    --mount type=bind,source="$FISH_SRC_DIR",target=/fish-source,readonly \
+    --mount type=bind,source="$workspace_root",target=/fish-source,readonly \
     $DOCKER_EXTRA_ARGS \
     "$IMG_TAGNAME"