From 0a94f3f5242c6c0d8bed5f41ddba28695dd377ce Mon Sep 17 00:00:00 2001
From: Robin Sommer <robin@corelight.com>
Date: Fri, 12 Jan 2024 13:17:39 +0100
Subject: [PATCH] fixup! Integrate bpftool.

---
 .github/workflows/main.yml | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 6a43c284..38d4f6c7 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -3,8 +3,8 @@ name: CI pipeline
 on: push
 
 jobs:
-  debug_ubuntu_latest:
-    runs-on: ubuntu-latest
+  debug_ubuntu_22:
+    runs-on: ubuntu-22.04
 
     strategy:
       matrix:
@@ -21,10 +21,12 @@ jobs:
         run: |
           export DEBIAN_FRONTEND=noninteractive
           sudo apt-get update
-          sudo apt-get install -y ninja-build ccache curl ca-certificates clang-tidy-12
-          sudo update-alternatives --install /usr/bin/clang-tidy clang-tidy /usr/bin/clang-tidy-12 100
+          sudo apt-get install -y ninja-build ccache curl ca-certificates
+          sudo apt-get install -y llvm-17-dev clang-17 libclang-17-dev clang-format-17 clang-tidy-17 libclang-rt-17-dev
+          sudo update-alternatives --install /usr/bin/clang-tidy clang-tidy /usr/bin/clang-tidy-17 100
           sudo pip3 install btest zkg pre-commit
 
+
           # for bpftool
           sudo apt-get install llvm libelf-dev gcc-multilib
 
@@ -69,7 +71,7 @@ jobs:
 
   # TODO: Install Zeek and run Zeek tests.
   release_alpine_3_15_static:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     environment: ${{ (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/topic/ci-release-test' || startsWith(github.ref, 'refs/tags/v')) && 'release' || '' }}
 
     container:
@@ -324,7 +326,7 @@ jobs:
           path: build/dist/${{env.ZA_DIST}}
 
   release_source:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     environment: ${{ (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/topic/ci-release-test' || startsWith(github.ref, 'refs/tags/v')) && 'release' || '' }}
 
     steps:
@@ -370,9 +372,9 @@ jobs:
   publish_release:
     permissions:
       contents: write
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     if: (startsWith(github.ref, 'refs/tags/v') && !contains(github.ref, '-dev'))
-    needs: [debug_ubuntu_latest, release_alpine_3_15_static, release_macos_13, release_windows_2022, release_source]
+    needs: [debug_ubuntu_22, release_alpine_3_15_static, release_macos_13, release_windows_2022, release_source]
     steps:
       - name: Checkout code
         uses: actions/checkout@v4