Browse Source

Update carla and dpf, tweak windows CI

Signed-off-by: falkTX <falktx@falktx.com>
tags/23.07
falkTX 2 years ago
parent
commit
e39170b12b
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
3 changed files with 4 additions and 8 deletions
  1. +2
    -6
      .github/workflows/build.yml
  2. +1
    -1
      carla
  3. +1
    -1
      dpf

+ 2
- 6
.github/workflows/build.yml View File

@@ -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


+ 1
- 1
carla

@@ -1 +1 @@
Subproject commit 96b67721b68585e3980a32b3e558160d59305050
Subproject commit ad7def4bd0dbd9c2470a72cae79089a0a17dad7f

+ 1
- 1
dpf

@@ -1 +1 @@
Subproject commit bd8cc43bd1cb5b02f5ef5f5963ecbd266ab03204
Subproject commit 1736c842c5c6d609fabce8f46de3e732d17e9c90

Loading…
Cancel
Save