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

Update dpf and carla, CI tweaks

Browse source 
Signed-off-by: falkTX <falktx@falktx.com>
This commit is contained in:
falkTX 2022-01-09 05:46:41 +00:00
parent 70039adcd6
commit a1e0af2fda
No known key found for this signature in database
GPG key ID: CDBAA37ABC74FBA0
3 changed files with 30 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -28,6 +28,11 @@ jobs:
~/work/Cardinal/Cardinal/build/plugins ~/work/Cardinal/Cardinal/build/plugins
~/work/Cardinal/Cardinal/build/rack ~/work/Cardinal/Cardinal/build/rack
key: linux-arm64-v${{ env.CACHE_VERSION }} key: linux-arm64-v${{ env.CACHE_VERSION }}
- name: Fix GitHub's mess
run: |
sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
sudo apt-get update -qq
sudo apt-get install -yqq --allow-downgrades libpcre2-8-0/focal libpcre2-16-0/focal libpcre2-32-0/focal libpcre2-posix2/focal
- name: Set up dependencies - name: Set up dependencies
run: | run: |
sudo dpkg --add-architecture arm64 sudo dpkg --add-architecture arm64
@ -74,6 +79,11 @@ jobs:
~/work/Cardinal/Cardinal/build/plugins ~/work/Cardinal/Cardinal/build/plugins
~/work/Cardinal/Cardinal/build/rack ~/work/Cardinal/Cardinal/build/rack
key: linux-armhf-v${{ env.CACHE_VERSION }} key: linux-armhf-v${{ env.CACHE_VERSION }}
- name: Fix GitHub's mess
run: |
sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
sudo apt-get update -qq
sudo apt-get install -yqq --allow-downgrades libpcre2-8-0/focal libpcre2-16-0/focal libpcre2-32-0/focal libpcre2-posix2/focal
- name: Set up dependencies - name: Set up dependencies
run: | run: |
sudo dpkg --add-architecture armhf sudo dpkg --add-architecture armhf
@ -120,6 +130,11 @@ jobs:
~/work/Cardinal/Cardinal/build/plugins ~/work/Cardinal/Cardinal/build/plugins
~/work/Cardinal/Cardinal/build/rack ~/work/Cardinal/Cardinal/build/rack
key: linux-i686-v${{ env.CACHE_VERSION }} key: linux-i686-v${{ env.CACHE_VERSION }}
- name: Fix GitHub's mess
run: |
sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
sudo apt-get update -qq
sudo apt-get install -yqq --allow-downgrades libpcre2-8-0/focal libpcre2-16-0/focal libpcre2-32-0/focal libpcre2-posix2/focal
- name: Set up dependencies - name: Set up dependencies
run: | run: |
sudo dpkg --add-architecture i386 sudo dpkg --add-architecture i386
@ -196,7 +211,7 @@ jobs:
- name: Set up dependencies - name: Set up dependencies
run: | run: |
sudo apt-get update -qq sudo apt-get update -qq
sudo apt-get install -yqq libgl1-mesa-dev liblo-dev libx11-dev libxcursor-dev libxext-dev libxrandr-dev sudo apt-get install -yqq libdbus-1-dev libgl1-mesa-dev liblo-dev libx11-dev libxcursor-dev libxext-dev libxrandr-dev
- name: Build linux x86_64 (debug) - name: Build linux x86_64 (debug)
env: env:
LDFLAGS: -static-libgcc -static-libstdc++ LDFLAGS: -static-libgcc -static-libstdc++
@ -239,7 +254,7 @@ jobs:
- name: Set up dependencies - name: Set up dependencies
run: | run: |
sudo apt-get update -qq sudo apt-get update -qq
sudo apt-get install -yqq libgl1-mesa-dev liblo-dev libx11-dev libxcursor-dev libxext-dev libxrandr-dev libarchive-dev libjansson-dev libsamplerate0-dev libsndfile1-dev libspeexdsp-dev sudo apt-get install -yqq libdbus-1-dev libgl1-mesa-dev liblo-dev libx11-dev libxcursor-dev libxext-dev libxrandr-dev libarchive-dev libjansson-dev libsamplerate0-dev libsndfile1-dev libspeexdsp-dev
- name: Build linux x86_64 (sysdeps) - name: Build linux x86_64 (sysdeps)
run: | run: |
make features make features
@ -282,7 +297,7 @@ jobs:
*-macOS.pkg *-macOS.pkg
win32: win32:
runs-on: ubuntu-18.04 runs-on: ubuntu-20.04
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
with: with:
@ -295,9 +310,13 @@ jobs:
~/work/Cardinal/Cardinal/build/plugins ~/work/Cardinal/Cardinal/build/plugins
~/work/Cardinal/Cardinal/build/rack ~/work/Cardinal/Cardinal/build/rack
key: win32-v${{ env.CACHE_VERSION }} key: win32-v${{ env.CACHE_VERSION }}
- name: Fix GitHub's mess
run: |
sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
sudo apt-get update -qq
sudo apt-get install -yqq --allow-downgrades libpcre2-8-0/focal libpcre2-16-0/focal libpcre2-32-0/focal libpcre2-posix2/focal
- name: Set up dependencies - name: Set up dependencies
run: | run: |
sudo add-apt-repository -y ppa:cybermax-dexter/mingw-w64-backport
sudo dpkg --add-architecture i386 sudo dpkg --add-architecture i386
sudo apt-get update -qq sudo apt-get update -qq
sudo apt-get install -yqq binutils-mingw-w64-i686 g++-mingw-w64-i686 mingw-w64 wine-stable:i386 sudo apt-get install -yqq binutils-mingw-w64-i686 g++-mingw-w64-i686 mingw-w64 wine-stable:i386
@ -335,6 +354,11 @@ jobs:
~/work/Cardinal/Cardinal/build/plugins ~/work/Cardinal/Cardinal/build/plugins
~/work/Cardinal/Cardinal/build/rack ~/work/Cardinal/Cardinal/build/rack
key: win64-v${{ env.CACHE_VERSION }} key: win64-v${{ env.CACHE_VERSION }}
- name: Fix GitHub's mess
run: |
sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
sudo apt-get update -qq
sudo apt-get install -yqq --allow-downgrades libpcre2-8-0/focal libpcre2-16-0/focal libpcre2-32-0/focal libpcre2-posix2/focal
- name: Set up dependencies - name: Set up dependencies
run: | run: |
sudo apt-get update -qq sudo apt-get update -qq

2
carla

@ -1 +1 @@
Subproject commit 3bc96e352c113820cacadea7f15fcaa4a1542a01 Subproject commit 613e6950581ad0cb3c037fac7f0db89633e099e6

2
dpf

@ -1 +1 @@
Subproject commit 7b3b7bacf5b57afd294603642811e72452847f17 Subproject commit 5d7fd17f6a634ccd648a264743319c145928a27c