From d5f2aeacddb62747818bfe3352e18756d9b7833f Mon Sep 17 00:00:00 2001 From: Jose Fonseca Date: Sat, 31 Aug 2024 09:52:26 +0100 Subject: [PATCH] github: Upgrade to Ubuntu 24.04. --- .github/workflows/build.yml | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a74f4a8..10af1f9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -47,24 +47,18 @@ jobs: if-no-files-found: error build-cross-gcc: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 with: fetch-depth: 1 submodules: recursive - run: sudo dpkg --add-architecture i386 - # Workaround https://github.com/actions/virtual-environments/issues/4589 - - run: | - sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list - sudo apt-get update -qq - sudo apt-get install -yqq --allow-downgrades libgd3/jammy libpcre2-8-0/jammy libpcre2-16-0/jammy libpcre2-32-0/jammy libpcre2-posix3/jammy - sudo apt-get purge -yqq libmono* moby* mono* php* libgdiplus libzip4 - run: sudo apt-get install -yqq --install-recommends mingw-w64 ninja-build cmake xinit xvfb wine wine64 wine32:i386 - run: ci/build.sh build-cross-clang: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 with: @@ -77,12 +71,6 @@ jobs: path: downloads/*.xz key: ${{ runner.os }}-${{ hashFiles('ci/dependencies-clang.sh') }} - run: sudo dpkg --add-architecture i386 - # Workaround https://github.com/actions/virtual-environments/issues/4589 - - run: | - sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list - sudo apt-get update -qq - sudo apt-get install -yqq --allow-downgrades libgd3/jammy libpcre2-8-0/jammy libpcre2-16-0/jammy libpcre2-32-0/jammy libpcre2-posix3/jammy - sudo apt-get purge -yqq libmono* moby* mono* php* libgdiplus libzip4 - run: sudo apt-get install -yqq --install-recommends ninja-build cmake xinit xvfb wine wine64 wine32:i386 - run: ci/build-clang.sh - name: Upload artifact