From 5868cd7f64a1ed4ce57547591e720296b6993d33 Mon Sep 17 00:00:00 2001 From: Yaraslau Tamashevich Date: Tue, 24 Sep 2024 10:35:51 +0300 Subject: [PATCH] Update ubuntu version for github build --- .github/workflows/build.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 04ae63a..099028d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -45,8 +45,8 @@ jobs: run: ./scripts/check-includes.sh ubuntu_linux: - name: "Ubuntu Linux 22.04" - runs-on: ubuntu-22.04 + name: "Ubuntu Linux 24.04" + runs-on: ubuntu-24.04 env: CMAKE_PRESET: "linux-gcc-release" steps: @@ -54,7 +54,7 @@ jobs: - name: ccache uses: hendrikmuhs/ccache-action@v1 with: - key: "ccache-ubuntu_2204" + key: "ccache-ubuntu_2404" max-size: 256M - name: set environment variables id: set_vars @@ -67,18 +67,18 @@ jobs: sudo apt -q update sudo apt install -qy ninja-build sudo ./scripts/install-deps.sh - - name: "Install GCC 12" - run: sudo apt install g++-12 + - name: "Install GCC" + run: sudo apt install g++ - name: "cmake" - run: cmake --preset "$CMAKE_PRESET" -D CMAKE_CXX_COMPILER="g++-12" + run: cmake --preset "$CMAKE_PRESET" -D CMAKE_CXX_COMPILER="g++" - name: "build" run: cmake --build --preset "$CMAKE_PRESET" --preset -- -j3 - name: "install dependencies for running benchmarks" run: ./scripts/xvfb-deps.sh - name: "Install contour" run: | - wget https://github.com/contour-terminal/contour/releases/download/v$CONTOUR_VERSION/contour-$CONTOUR_VERSION-ubuntu22.04-amd64.deb - sudo dpkg -i contour-$CONTOUR_VERSION-ubuntu22.04-amd64.deb + wget https://github.com/contour-terminal/contour/releases/download/v$CONTOUR_VERSION/contour-$CONTOUR_VERSION-ubuntu24.04-amd64.deb + sudo dpkg -i contour-$CONTOUR_VERSION-ubuntu25.04-amd64.deb - name: "create and patch contour.yml config file" run: | set -ex