brian/Cardinal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update carla and dpf, tweak windows CI

Browse source 
Signed-off-by: falkTX <falktx@falktx.com>
This commit is contained in:
falkTX 2023-05-17 20:14:01 +02:00
parent 4679575a95
commit e39170b12b
No known key found for this signature in database
GPG key ID: CDBAA37ABC74FBA0
3 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
.github/workflows/build.yml vendored
View file

@ -427,22 +427,18 @@ jobs:
- name: Fix GitHub's mess - name: Fix GitHub's mess
run: | run: |
sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
sudo dpkg --add-architecture i386
sudo apt-get update -qq sudo apt-get update -qq
sudo apt-get install -yqq --allow-downgrades libgd3/jammy sudo apt-get install libc6:i386 libgcc-s1:i386 libstdc++6:i386 --allow-downgrades
sudo apt-get purge -yqq libclang* libgbm* libllvm* libmono* moby* mono* msbuild* php* libgdiplus libpcre2-posix3 libzip4
sudo apt-get clean sudo apt-get clean
- name: Set up dependencies - name: Set up dependencies
if: ${{ matrix.target == 'win32' }} if: ${{ matrix.target == 'win32' }}
run: | 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 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 sudo apt-get clean
- name: Set up dependencies - name: Set up dependencies
if: ${{ matrix.target == 'win64' }} if: ${{ matrix.target == 'win64' }}
run: | 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 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 sudo apt-get clean
- name: Set up ccache - name: Set up ccache

2
carla

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

2
dpf

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