Update ubuntu & clang-format in builds (#5467)

i3 · Apr 2, 2023 · 892ae73 · 892ae73
1 parent ecb9b89
commit 892ae73
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -84,8 +84,8 @@ jobs:
       run: ./release-notes/generator.pl
     - name: Install dependencies
       run: |
-        sudo apt-get install -y clang-format-12
+        sudo apt-get install -y clang-format-14
     - name: Check formatting
-      run: clang-format-12 --dry-run --Werror $(git ls-files '*.c' '*.h')
+      run: clang-format-14 --dry-run --Werror $(git ls-files '*.c' '*.h')
     - name: Verify safe wrapper functions are used
       run: ./travis/check-safe-wrappers.sh
diff --git a/i3bar/include/xcb.h b/i3bar/include/xcb.h
@@ -12,7 +12,6 @@
 #include <config.h>
 
 #include <stdint.h>
-//#include "outputs.h"
 
 #define _NET_SYSTEM_TRAY_ORIENTATION_HORZ 0
 #define _NET_SYSTEM_TRAY_ORIENTATION_VERT 1

diff --git a/travis/travis-base-ubuntu.Dockerfile b/travis/travis-base-ubuntu.Dockerfile
@@ -1,7 +1,7 @@
 # vim:ft=Dockerfile
 # Same as travis-base.Dockerfile, but without the test suite dependencies since
 # we only build Debian packages on Ubuntu, we don’t run the tests.
-FROM ubuntu:focal
+FROM ubuntu:jammy
 
 RUN echo force-unsafe-io > /etc/dpkg/dpkg.cfg.d/docker-apt-speedup
 # Paper over occasional network flakiness of some mirrors.