Skip to content

Commit

Permalink
github: bump to ubuntu 22.04
Browse files Browse the repository at this point in the history
This should get the aya integration tests passing, which are not yet
able to run on older kernels. See aya-rs/aya#725
and aya-rs/aya#638.
  • Loading branch information
tamird committed Aug 8, 2023
1 parent 400f19c commit 4ab66e0
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 8 deletions.
17 changes: 11 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
uses: ./.github/workflows/llvm.yml

lint-stable:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v3
Expand All @@ -34,7 +34,7 @@ jobs:
run: cargo clippy --features llvm-sys/no-llvm-linking --all-targets --workspace -- --deny warnings

lint-nightly:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v3
Expand All @@ -48,7 +48,7 @@ jobs:
run: cargo fmt --all -- --check

build:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -91,11 +91,16 @@ jobs:

- name: Install dependencies
if: matrix.rust == 'nightly'
# ubuntu-20.04 comes with clang prior to
# https://github.com/llvm/llvm-project/commit/6d6750696400 which does not implement
# __builtin_preserve_enum_value, used by relocation tests in aya.
# ubuntu-22.04 comes with clang 14[0] which doesn't include support for signed and 64bit
# enum values which was added in clang 15[1].
#
# gcc-multilib provides at least <asm/types.h> which is referenced by libbpf.
#
# llvm provides llvm-objcopy which is used to build the BTF relocation tests.
#
# [0] https://github.com/actions/runner-images/blob/ubuntu22/20230724.1/images/linux/Ubuntu2204-Readme.md
#
# [1] https://github.com/llvm/llvm-project/commit/dc1c43d
run: |
set -euxo pipefail
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/llvm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:

jobs:
llvm:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
name: llvm
outputs:
cache-key: ${{ steps.cache-key.outputs.cache-key }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:

upload-bins:
# TODO: Build for macos someday.
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
needs: llvm
steps:
- name: Restore LLVM
Expand Down

0 comments on commit 4ab66e0

Please sign in to comment.