From 358062b1a297159ecdc40eb66d2ef0a1cef368b7 Mon Sep 17 00:00:00 2001 From: Jason Ish Date: Wed, 6 Dec 2023 10:09:47 -0600 Subject: [PATCH] github-ci/formatting: update to Ubuntu 22.04 Update the formatting CI job to Ubuntu 22.04 to get a newer version of clang-format, in this case clang-format-14. (cherry picked from commit 93071501b5a233b0499dc4c5f00ba9be34eb2c52) --- .github/workflows/formatting.yml | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/.github/workflows/formatting.yml b/.github/workflows/formatting.yml index ca7b018e36..03a8e81169 100644 --- a/.github/workflows/formatting.yml +++ b/.github/workflows/formatting.yml @@ -21,9 +21,9 @@ jobs: # Checking for correct formatting of branch for C code changes check-formatting: - name: Formatting Check (clang 9) - runs-on: ubuntu-20.04 - container: ubuntu:20.04 + name: Formatting Check (clang 14) + runs-on: ubuntu-22.04 + container: ubuntu:22.04 continue-on-error: false steps: @@ -43,6 +43,8 @@ jobs: autoconf \ automake \ cargo \ + cbindgen \ + clang-format-14 \ git \ libtool \ libpcap-dev \ @@ -58,21 +60,14 @@ jobs: libnfnetlink0 \ libhiredis-dev \ libjansson-dev \ - libpython2.7 \ make \ - python \ rustc \ + python-is-python3 \ + python3 \ software-properties-common \ wget \ zlib1g \ zlib1g-dev - - name: Install packages for clang-format 9 - run: | - # no need to install full clang - apt-get install -y clang-format-9 - - name: Install cbindgen - run: cargo install --force --debug --version 0.24.3 cbindgen - - run: echo "$HOME/.cargo/bin" >> $GITHUB_PATH # Checking out the branch is not as simple as "checking out". # # In case master has any new commits since we branched off, github will -- 2.47.2