From f74ed2ecb8dfad619c46f09a1011383c8d93f8d6 Mon Sep 17 00:00:00 2001 From: Marat Abrarov Date: Sun, 20 Apr 2025 12:08:27 +0300 Subject: [PATCH] ci: replaced Ubuntu 20.04 GitHub actions runners with Ubuntu 22.04 runners due to deprecation of Ubuntu 20.04 runners (https://github.com/actions/runner-images/issues/11101). Signed-off-by: Marat Abrarov --- .github/workflows/pr-compile-check.yaml | 12 ++++++------ .github/workflows/unit-tests.yaml | 14 +++++++------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/pr-compile-check.yaml b/.github/workflows/pr-compile-check.yaml index 56fbc192aef..5aae5b9a324 100644 --- a/.github/workflows/pr-compile-check.yaml +++ b/.github/workflows/pr-compile-check.yaml @@ -33,7 +33,7 @@ jobs: # Sanity check for compilation using system libraries pr-compile-system-libs: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 timeout-minutes: 60 strategy: fail-fast: false @@ -51,9 +51,9 @@ jobs: - name: Setup environment run: | sudo apt-get update - sudo apt-get install -y curl gcc-7 g++-7 clang-6.0 libsystemd-dev gcovr libyaml-dev libluajit-5.1-dev \ + sudo apt-get install -y curl gcc-9 g++-9 clang-12 libsystemd-dev gcovr libyaml-dev libluajit-5.1-dev \ libnghttp2-dev libjemalloc-dev - sudo ln -s /usr/bin/llvm-symbolizer-6.0 /usr/bin/llvm-symbolizer || true + sudo ln -s /usr/bin/llvm-symbolizer-12 /usr/bin/llvm-symbolizer || true mkdir -p /tmp/libbacktrace/build && \ curl -L https://github.com/ianlancetaylor/libbacktrace/archive/8602fda.tar.gz | \ tar --strip-components=1 -xzC /tmp/libbacktrace/ && \ @@ -66,9 +66,9 @@ jobs: run: | export nparallel=$(( $(getconf _NPROCESSORS_ONLN) > 8 ? 8 : $(getconf _NPROCESSORS_ONLN) )) echo "CC = $CC, CXX = $CXX, FLB_OPT = $FLB_OPT" - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 90 - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-7 90 - sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-6.0 90 + sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 90 + sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-9 90 + sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-12 90 cmake $GLOBAL_OPTS $FLB_OPT ../ make -j $nparallel working-directory: build diff --git a/.github/workflows/unit-tests.yaml b/.github/workflows/unit-tests.yaml index 5b407d97270..9b0f7417d21 100644 --- a/.github/workflows/unit-tests.yaml +++ b/.github/workflows/unit-tests.yaml @@ -35,7 +35,7 @@ on: jobs: run-ubuntu-unit-tests: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 timeout-minutes: 60 strategy: fail-fast: false @@ -69,8 +69,8 @@ jobs: - name: Setup environment run: | sudo apt-get update - sudo apt-get install -y gcc-7 g++-7 clang-6.0 libsystemd-dev gcovr libyaml-dev libbpf-dev linux-tools-common - sudo ln -s /usr/bin/llvm-symbolizer-6.0 /usr/bin/llvm-symbolizer || true + sudo apt-get install -y gcc-9 g++-9 clang-12 libsystemd-dev gcovr libyaml-dev libbpf-dev linux-tools-common + sudo ln -s /usr/bin/llvm-symbolizer-12 /usr/bin/llvm-symbolizer || true - uses: actions/checkout@v4 @@ -82,9 +82,9 @@ jobs: - name: ${{ matrix.compiler.cc }} & ${{ matrix.compiler.cxx }} - ${{ matrix.flb_option }} run: | echo "CC = $CC, CXX = $CXX, FLB_OPT = $FLB_OPT" - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 90 - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-7 90 - sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-6.0 90 + sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 90 + sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-9 90 + sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-12 90 sudo usermod -a -G systemd-journal $(id -un) sudo -E su -p $(id -un) -c "PATH=$PATH ci/scripts/run-unit-tests.sh" env: @@ -182,7 +182,7 @@ jobs: # We chain this after Linux one as there are CPU time costs for QEMU emulation needs: - run-ubuntu-unit-tests - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 timeout-minutes: 60 strategy: fail-fast: false