From 892ae730cb5cdfe84deedf835696c30f5b94bd81 Mon Sep 17 00:00:00 2001
From: Orestis Floros <orestisflo@gmail.com>
Date: Sun, 2 Apr 2023 16:24:15 +0200
Subject: [PATCH] Update ubuntu & clang-format in builds (#5467)

---
 .github/workflows/main.yml           | 4 ++--
 i3bar/include/xcb.h                  | 1 -
 travis/travis-base-ubuntu.Dockerfile | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 98c7f380..e9842600 100644
--- 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
index 0e3ca22d..fa274d01 100644
--- 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
index c99cd603..253e6382 100644
--- 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.