From 03491904a0daaab2c4a2148e65ee94111ec9f2a9 Mon Sep 17 00:00:00 2001 From: narimiran Date: Mon, 17 Feb 2025 09:27:37 +0100 Subject: [PATCH] update CI to Ubuntu 24.04 --- .github/workflows/ci_bench.yml | 2 +- azure-pipelines.yml | 16 +++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci_bench.yml b/.github/workflows/ci_bench.yml index 188b4ade64..bf200ed73d 100644 --- a/.github/workflows/ci_bench.yml +++ b/.github/workflows/ci_bench.yml @@ -10,7 +10,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-20.04] + os: [ubuntu-24.04] cpu: [amd64] name: '${{ matrix.os }}' runs-on: ${{ matrix.os }} diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 0b7b8d5714..4779591307 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -20,7 +20,7 @@ jobs: strategy: matrix: Linux_amd64: - vmImage: 'ubuntu-20.04' + vmImage: 'ubuntu-24.04' CPU: amd64 # regularly breaks, refs bug #17325 # Linux_i386: @@ -80,10 +80,12 @@ jobs: - bash: | set -e . ci/funs.sh - echo_run sudo apt-fast update -qq + echo_run sudo add-apt-repository universe + echo_run sudo apt-get update -qq DEBIAN_FRONTEND='noninteractive' \ - echo_run sudo apt-fast install --no-install-recommends -yq \ - libcurl4-openssl-dev libgc-dev libsdl1.2-dev libsfml-dev valgrind libc6-dbg + echo_run sudo apt-get install --no-install-recommends -yq \ + gcc-14 g++-14 libpcre3 liblapack-dev libpcre3 liblapack-dev libcurl4-openssl-dev libgc-dev libsdl1.2-dev libsfml-dev valgrind libc6-dbg + echo_run sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-14 60 --slave /usr/bin/g++ g++ /usr/bin/g++-14 displayName: 'Install dependencies (amd64 Linux)' condition: and(succeeded(), eq(variables['skipci'], 'false'), eq(variables['Agent.OS'], 'Linux'), eq(variables['CPU'], 'amd64')) @@ -100,12 +102,12 @@ jobs: Pin-Priority: 1001 EOF - # echo_run sudo apt-fast update -qq - echo_run sudo apt-fast update -qq || echo "failed, see bug #17343" + # echo_run sudo apt-get update -qq + echo_run sudo apt-get update -qq || echo "failed, see bug #17343" # `:i386` (e.g. in `libffi-dev:i386`) is needed otherwise you may get: # `could not load: libffi.so` during dynamic loading. DEBIAN_FRONTEND='noninteractive' \ - echo_run sudo apt-fast install --no-install-recommends --allow-downgrades -yq \ + echo_run sudo apt-get install --no-install-recommends --allow-downgrades -yq \ g++-multilib gcc-multilib libcurl4-openssl-dev:i386 libgc-dev:i386 \ libsdl1.2-dev:i386 libsfml-dev:i386 libglib2.0-dev:i386 libffi-dev:i386