[pull] master from fish-shell:master

.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
+---

.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 \

build_tools/update-dependencies.sh

@@ -18,21 +18,23 @@ 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
+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 docker/build-push-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 EmbarkStudios/cargo-deny-action
 update_gh_action msys2/setup-msys2
+update_gh_action softprops/action-gh-release
 
 updatecli "${@:-apply}"
 

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"

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 \

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