[Scummvm-git-logs] scummvm branch-2-9 -> 6023b25f2e70334718170dcba29ebc2205da2e5b

[dwatteau]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .

Summary:
6023b25f2e CI: Unbreak by cherry picking what's on the main branch


Commit: 6023b25f2e70334718170dcba29ebc2205da2e5b
    https://github.com/scummvm/scummvm/commit/6023b25f2e70334718170dcba29ebc2205da2e5b
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2025-04-26T14:53:18+02:00

Commit Message:
CI: Unbreak by cherry picking what's on the main branch

Cherry pick commits:

33600327493ccf3c81ad68104c83d5fdb45f3906
7ed0e022a52150a4811cff0e6b5084bb36918e37
2821fcd1f6a000d8b152b757589bf35b5e69387c
ea5db0b3ea2d041520d410ed24d1d141f780fcb1

Changed paths:
    .github/workflows/ci.yml


diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c297021de9a..49199e94fc4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -39,11 +39,15 @@ jobs:
         uses: actions/checkout at v4
       - uses: ilammy/setup-nasm at v1
         if: matrix.useNasm == 'true'
+      - name: Force CMake < 4.0 usage
+        uses: jwlawson/actions-setup-cmake at v2
+        with:
+          cmake-version: '3.31'
       - name: Install vcpkg
         uses: lukka/run-vcpkg at v11
         id: runvcpkg
         with:
-          vcpkgGitCommitId: 943c5ef1c8f6b5e6ced092b242c8299caae2ff01
+          vcpkgGitCommitId: b02e341c927f16d991edbd915d8ea43eac52096c
       - name: Integrate vcpkg
         run: |
           ${{ steps.runvcpkg.outputs.RUNVCPKG_VCPKG_ROOT_OUT }}/vcpkg integrate install
@@ -113,9 +117,6 @@ jobs:
             buildFlags: -scheme ScummVM-iOS CODE_SIGN_IDENTITY="" CODE_SIGNING_ALLOWED=NO
             configFlags: --use-xcframework --enable-faad --enable-gif --enable-mikmod --enable-mpeg2 --enable-vpx --disable-nasm --disable-taskbar --disable-tts
             packagesUrl: https://downloads.scummvm.org/frs/build/scummvm-ios7-libs-v3.zip
-    env:
-      BUILDCACHE_MAX_CACHE_SIZE: 2000000000
-      BUILDCACHE_HARD_LINKS: true
     defaults:
       run:
         # Must be explicit for proper pipefail support
@@ -143,9 +144,11 @@ jobs:
           ./devtools/create_project/xcode/build/Release/create_project . --xcode --enable-all-engines ${{ matrix.configFlags }}
           ls
       - name: Build cache
-        uses: mikehardy/buildcache-action at v2
+        uses: hendrikmuhs/ccache-action at v1.2
         with:
-          cache_key: ${{ matrix.platform }}
+          key: ${{ matrix.platform }}
+          max-size: 1G
+          create-symlink: true
       - name: Build scummvm
         run: |
           xcodebuild CC=clang CPLUSPLUS=clang++ LD=clang LDPLUSPLUS=clang++ build -project scummvm.xcodeproj ${{ matrix.buildFlags }} | awk '$1 !~ /^(export|cd|clang++)/'
@@ -162,7 +165,7 @@ jobs:
             cxx: ccache g++
             aptPackages: 'liba52-dev libcurl4-openssl-dev libfaad-dev libflac-dev libfluidsynth-dev libfreetype6-dev libfribidi-dev libgif-dev libgtk-3-dev libjpeg-turbo8-dev libmad0-dev libmikmod-dev libmpeg2-4-dev libogg-dev libpng-dev libsdl2-dev libsdl2-net-dev libsndio-dev libspeechd-dev libtheora-dev libunity-dev libvorbis-dev libvpx-dev zlib1g-dev'
             configFlags: --enable-discord --with-discord-prefix=/usr/local
-          - platform: ubuntu-20.04
+          - platform: ubuntu-22.04
             sdlConfig: sdl-config
             cxx: ccache g++-4.8
             aptPackages: 'g++-4.8 liba52-dev libcurl4-openssl-dev libfaad-dev libflac-dev libfluidsynth-dev libfreetype6-dev libfribidi-dev libgif-dev libgtk-3-dev libjpeg-turbo8-dev libmad0-dev libmikmod-dev libmpeg2-4-dev libogg-dev libpng-dev libsdl-net1.2-dev libsdl1.2-dev libsndio-dev libspeechd-dev libtheora-dev libunity-dev libvorbis-dev libvpx-dev zlib1g-dev'
@@ -177,10 +180,12 @@ jobs:
       - name: Checkout
         uses: actions/checkout at v4
       - name: Add Ubuntu Xenial package sources
-        if: matrix.platform == 'ubuntu-20.04'
+        if: matrix.platform == 'ubuntu-22.04'
         run: |
-          sudo apt-add-repository 'deb http://archive.ubuntu.com/ubuntu/ xenial main'
-          sudo apt-add-repository 'deb http://archive.ubuntu.com/ubuntu/ xenial universe'
+          sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-key 40976EAF437D05B5
+          sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-key 3B4FE6ACC0B21F32
+          sudo apt-add-repository 'deb http://azure.archive.ubuntu.com/ubuntu/ xenial main'
+          sudo apt-add-repository 'deb http://azure.archive.ubuntu.com/ubuntu/ xenial universe'
       - name: Install packages
         run: |
           sudo apt-get update