Skip to content

Commit

Permalink
fixup! Integrate bpftool.
Browse files Browse the repository at this point in the history
  • Loading branch information
rsmmr committed Jan 12, 2024
1 parent d5bfb59 commit 5df8753
Showing 1 changed file with 20 additions and 11 deletions.
31 changes: 20 additions & 11 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -21,12 +21,21 @@ 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 update-alternatives --install /usr/bin/clang-tidy clang-tidy /usr/bin/clang-tidy-17 100
sudo pip3 install btest zkg pre-commit
# LLVM toolchain
sudo echo 'deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-17 main' >> /etc/apt/sources.list.d/llvm17.list
sudo echo 'deb-src http://apt.llvm.org/jammy/ llvm-toolchain-jammy-17 main' >> /etc/apt/sources.list.d/llvm17.list
sudo curl https://apt.llvm.org/llvm-snapshot.gpg.key -o /etc/apt/trusted.gpg.d/llvm.asc
sudo apt-get update
sudo apt-get install -y llvm-17-dev clang-17 libclang-17-dev clang-format-17 clang-tidy-17 libclang-rt-17-dev
# for bpftool
sudo apt-get install llvm libelf-dev gcc-multilib
sudo ln -s $(which llvm-strip-17) /usr/local/bin/llvm-strip
sudo apt-get install libelf-dev gcc-multilib
- name: Install Zeek
run: |
Expand Down Expand Up @@ -68,12 +77,12 @@ jobs:
zeek-agent/tests/.tmp
# TODO: Install Zeek and run Zeek tests.
release_alpine_3_15_static:
runs-on: ubuntu-latest
release_alpine_3_19_static:
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:
image: alpine:3.15
image: alpine:3.19

steps:
- name: Prepare
Expand Down Expand Up @@ -324,7 +333,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:
Expand Down Expand Up @@ -370,9 +379,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_19_static, release_macos_13, release_windows_2022, release_source]
steps:
- name: Checkout code
uses: actions/checkout@v4
Expand Down

0 comments on commit 5df8753

Please sign in to comment.