From f390d7c8ba76464a4cae1dc22fcd9889272aab08 Mon Sep 17 00:00:00 2001
From: Orestis Floros <orestisflo@gmail.com>
Date: Thu, 23 May 2024 10:01:06 +0200
Subject: [PATCH] Update clang-format

- Rename travis dir
- Use same versions as in the i3 workflows
---
 .github/workflows/main.yml | 8 ++++----
 {travis => ci}/Dockerfile  | 2 +-
 meson/meson-dist-script    | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)
 rename {travis => ci}/Dockerfile (93%)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index e7dfc82f..819dbc14 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -20,15 +20,15 @@ jobs:
     - run: git fetch --prune --unshallow
     - name: fetch or build Docker container
       run: |
-        docker build --pull --no-cache --rm -t=i3lock -f travis/Dockerfile .
+        docker build --pull --no-cache --rm -t=i3lock -f ci/Dockerfile .
         docker run -e CC -v $PWD:/usr/src:rw i3lock /bin/sh -c 'git config --global --add safe.directory /usr/src && mkdir build && cd build && CFLAGS="-Wformat -Wformat-security -Wextra -Wno-unused-parameter -Werror" meson .. && ninja'
   formatting:
     name: Check formatting
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
     - name: Install dependencies
       run: |
-        sudo apt-get install -y clang-format-11
+        sudo apt-get install -y clang-format-15
     - name: Check formatting
-      run: clang-format-11 --dry-run --Werror $(git ls-files '*.c' 'include/*.h')
+      run: clang-format-15 --dry-run --Werror $(git ls-files '*.c' 'include/*.h')
diff --git a/travis/Dockerfile b/ci/Dockerfile
similarity index 93%
rename from travis/Dockerfile
rename to ci/Dockerfile
index 9dc8137c..17dd297e 100644
--- a/travis/Dockerfile
+++ b/ci/Dockerfile
@@ -11,7 +11,7 @@ RUN echo 'APT::Acquire::Retries "5";' > /etc/apt/apt.conf.d/80retry
 # (3608 kB/s)). Hence, let’s stick with httpredir.debian.org (default) for now.
 
 # Install mk-build-deps (for installing the i3 build dependencies),
-# clang and clang-format-9 (for checking formatting and building with clang),
+# clang (for building),
 # lintian (for checking spelling errors),
 # test suite dependencies (for running tests)
 RUN apt-get update && \
diff --git a/meson/meson-dist-script b/meson/meson-dist-script
index 66c8c320..a6a11510 100755
--- a/meson/meson-dist-script
+++ b/meson/meson-dist-script
@@ -8,5 +8,5 @@ cd "${MESON_DIST_ROOT}"
 rm -rf \
    .clang-format \
    .editorconfig \
-   travis \
+   ci \
    .github