diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5246748..652dfd0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -427,22 +427,18 @@ jobs: - name: Fix GitHub's mess run: | sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list + sudo dpkg --add-architecture i386 sudo apt-get update -qq - sudo apt-get install -yqq --allow-downgrades libgd3/jammy - sudo apt-get purge -yqq libclang* libgbm* libllvm* libmono* moby* mono* msbuild* php* libgdiplus libpcre2-posix3 libzip4 + sudo apt-get install libc6:i386 libgcc-s1:i386 libstdc++6:i386 --allow-downgrades sudo apt-get clean - name: Set up dependencies if: ${{ matrix.target == 'win32' }} run: | - sudo dpkg --add-architecture i386 - sudo apt-get update -qq sudo apt-get install -yqq binutils-mingw-w64-i686 g++-mingw-w64-i686 mingw-w64 wine-stable:i386 gperf qttools5-dev qttools5-dev-tools xvfb sudo apt-get clean - name: Set up dependencies if: ${{ matrix.target == 'win64' }} run: | - sudo dpkg --add-architecture i386 - sudo apt-get update -qq sudo apt-get install -yqq binutils-mingw-w64-x86-64 g++-mingw-w64-x86-64 mingw-w64 wine-stable gperf qttools5-dev qttools5-dev-tools xvfb sudo apt-get clean - name: Set up ccache diff --git a/carla b/carla index 96b6772..ad7def4 160000 --- a/carla +++ b/carla @@ -1 +1 @@ -Subproject commit 96b67721b68585e3980a32b3e558160d59305050 +Subproject commit ad7def4bd0dbd9c2470a72cae79089a0a17dad7f diff --git a/dpf b/dpf index bd8cc43..1736c84 160000 --- a/dpf +++ b/dpf @@ -1 +1 @@ -Subproject commit bd8cc43bd1cb5b02f5ef5f5963ecbd266ab03204 +Subproject commit 1736c842c5c6d609fabce8f46de3e732d17e9c90