From ed2545030675ea00dd1c649ca4e87d45cff9270c Mon Sep 17 00:00:00 2001 From: falkTX Date: Mon, 26 Sep 2022 16:05:52 +0100 Subject: [PATCH] Rebuild/update cache, update carla, dpf and pawpaw to latest Signed-off-by: falkTX --- .github/workflows/build.yml | 25 +++++++++---------------- Makefile | 22 ++++++++++++++++++++++ carla | 2 +- deps/PawPaw | 2 +- dpf | 2 +- 5 files changed, 34 insertions(+), 19 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fabb760..0b64df1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,7 +4,7 @@ on: push: env: - CACHE_VERSION: 33 + CACHE_VERSION: 34 CARDINAL_UNDER_WINE: 1 DEBIAN_FRONTEND: noninteractive HOMEBREW_NO_AUTO_UPDATE: 1 @@ -57,7 +57,6 @@ jobs: PKG_CONFIG_PATH: /usr/lib/aarch64-linux-gnu/pkgconfig run: | if [ "${{ env.WITH_LTO }}" != "true" ]; then export PAWPAW_SKIP_LTO=1; fi - export PATH="/usr/lib/ccache:${PATH}" ./deps/PawPaw/bootstrap-cardinal.sh linux-aarch64 && ./deps/PawPaw/.cleanup.sh linux-aarch64 - name: Build linux arm64 cross-compiled run: | @@ -142,7 +141,6 @@ jobs: PKG_CONFIG_PATH: /usr/lib/arm-linux-gnueabihf/pkgconfig run: | if [ "${{ env.WITH_LTO }}" != "true" ]; then export PAWPAW_SKIP_LTO=1; fi - export PATH="/usr/lib/ccache:${PATH}" ./deps/PawPaw/bootstrap-cardinal.sh linux-armhf && ./deps/PawPaw/.cleanup.sh linux-armhf - name: Build linux armhf cross-compiled run: | @@ -223,7 +221,6 @@ jobs: PKG_CONFIG_PATH: /usr/lib/i386-linux-gnu/pkgconfig run: | if [ "${{ env.WITH_LTO }}" != "true" ]; then export PAWPAW_SKIP_LTO=1; fi - export PATH="/usr/lib/ccache:${PATH}" ./deps/PawPaw/bootstrap-cardinal.sh linux-i686 && ./deps/PawPaw/.cleanup.sh linux-i686 - name: Build linux i686 run: | @@ -309,7 +306,6 @@ jobs: PKG_CONFIG_PATH: /usr/lib/riscv64-linux-gnu/pkgconfig run: | if [ "${{ env.WITH_LTO }}" != "true" ]; then export PAWPAW_SKIP_LTO=1; fi - export PATH="/usr/lib/ccache:${PATH}" ./deps/PawPaw/bootstrap-cardinal.sh linux-riscv64 && ./deps/PawPaw/.cleanup.sh linux-riscv64 - name: Build linux riscv64 cross-compiled run: | @@ -382,7 +378,6 @@ jobs: - name: Build extra dependencies run: | if [ "${{ env.WITH_LTO }}" != "true" ]; then export PAWPAW_SKIP_LTO=1; fi - export PATH="/usr/lib/ccache:${PATH}" ./deps/PawPaw/bootstrap-cardinal.sh linux && ./deps/PawPaw/.cleanup.sh linux - name: Build linux x86_64 run: | @@ -911,7 +906,7 @@ jobs: *.zip win32: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 with: @@ -936,8 +931,8 @@ jobs: run: | sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list sudo apt-get update -qq - sudo apt-get install -yqq --allow-downgrades libgd3/focal libpcre2-8-0/focal libpcre2-16-0/focal libpcre2-32-0/focal libpcre2-posix2/focal - sudo apt-get purge -yqq libmono* moby* mono* php* libgdiplus libpcre2-posix3 libzip4 + sudo apt-get install -yqq --allow-downgrades libgd3/jammy + sudo apt-get purge -yqq libmono* moby* mono* msbuild* php* libgdiplus libpcre2-posix3 nuget - name: Set up dependencies run: | sudo dpkg --add-architecture i386 @@ -950,7 +945,6 @@ jobs: - name: Build extra dependencies run: | if [ "${{ env.WITH_LTO }}" != "true" ]; then export PAWPAW_SKIP_LTO=1; fi - export PATH="/usr/lib/ccache:${PATH}" ./deps/PawPaw/bootstrap-cardinal.sh win32 && ./deps/PawPaw/.cleanup.sh win32 - name: Build win32 cross-compiled (base) run: | @@ -964,7 +958,7 @@ jobs: if [ "${{ env.WITH_LTO }}" != "true" ]; then export PAWPAW_SKIP_LTO=1; fi export PATH="/usr/lib/ccache:${PATH}" pushd deps/PawPaw; source local.env win32; popd - make -C carla CARLA_BACKEND_NAMESPACE=Cardinal EXTERNAL_PLUGINS=true HAVE_FLUIDSYNTH=false HAVE_ZYN_DEPS=false HAVE_ZYN_UI_DEPS=false HAVE_PYQT=true HAVE_QT5=true HAVE_QT5PKG=true STATIC_PLUGIN_TARGET=true USING_CUSTOM_DPF=true CUSTOM_DPF_PATH=$(pwd)/dpf -j $(nproc) + make carla-win32 -j $(nproc) make -C carla EMBED_TARGET=true TESTING=true dist make -C carla EMBED_TARGET=true TESTING=true dist - name: Build win64 cross-compiled (packaging) @@ -1006,7 +1000,7 @@ jobs: *.zip win64: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 with: @@ -1031,8 +1025,8 @@ jobs: run: | sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list sudo apt-get update -qq - sudo apt-get install -yqq --allow-downgrades libgd3/focal libpcre2-8-0/focal libpcre2-16-0/focal libpcre2-32-0/focal libpcre2-posix2/focal - sudo apt-get purge -yqq libmono* moby* mono* php* libgdiplus libpcre2-posix3 libzip4 + sudo apt-get install -yqq --allow-downgrades libgd3/jammy + sudo apt-get purge -yqq libmono* moby* mono* msbuild* php* libgdiplus libpcre2-posix3 nuget - name: Set up dependencies run: | sudo dpkg --add-architecture i386 @@ -1045,7 +1039,6 @@ jobs: - name: Build extra dependencies run: | if [ "${{ env.WITH_LTO }}" != "true" ]; then export PAWPAW_SKIP_LTO=1; fi - export PATH="/usr/lib/ccache:${PATH}" ./deps/PawPaw/bootstrap-cardinal.sh win64 && ./deps/PawPaw/.cleanup.sh win64 - name: Build win64 cross-compiled (base) run: | @@ -1059,7 +1052,7 @@ jobs: if [ "${{ env.WITH_LTO }}" != "true" ]; then export PAWPAW_SKIP_LTO=1; fi export PATH="/usr/lib/ccache:${PATH}" pushd deps/PawPaw; source local.env win64; popd - make -C carla CARLA_BACKEND_NAMESPACE=Cardinal EXTERNAL_PLUGINS=true HAVE_FLUIDSYNTH=false HAVE_ZYN_DEPS=false HAVE_ZYN_UI_DEPS=false HAVE_PYQT=true HAVE_QT5=true HAVE_QT5PKG=true STATIC_PLUGIN_TARGET=true USING_CUSTOM_DPF=true CUSTOM_DPF_PATH=$(pwd)/dpf all win32r -j $(nproc) + make carla-win32 -j $(nproc) make -C carla EMBED_TARGET=true TESTING=true dist make -C carla EMBED_TARGET=true TESTING=true dist - name: Build win64 cross-compiled (packaging) diff --git a/Makefile b/Makefile index 7673c4f..4871308 100644 --- a/Makefile +++ b/Makefile @@ -210,6 +210,28 @@ ifneq ($(STATIC_BUILD),true) USING_CUSTOM_DPF=true endif +carla-win32: +ifneq ($(STATIC_BUILD),true) + $(MAKE) all -C carla $(CARLA_EXTRA_ARGS) \ + CAN_GENERATE_LV2_TTL=false \ + CUSTOM_DPF_PATH=$(CURDIR)/dpf \ + HAVE_PYQT=true \ + HAVE_QT5=true \ + HAVE_QT5PKG=true \ + STATIC_PLUGIN_TARGET=true \ + USING_CUSTOM_DPF=true +ifeq ($(CPU_X86_64),true) + $(MAKE) win32r -C carla $(CARLA_EXTRA_ARGS) \ + CAN_GENERATE_LV2_TTL=false \ + CUSTOM_DPF_PATH=$(CURDIR)/dpf \ + HAVE_PYQT=true \ + HAVE_QT5=true \ + HAVE_QT5PKG=true \ + STATIC_PLUGIN_TARGET=true \ + USING_CUSTOM_DPF=true +endif +endif + deps: ifeq ($(SYSDEPS),true) $(MAKE) quickjs -C deps diff --git a/carla b/carla index 8c58d09..76cdd50 160000 --- a/carla +++ b/carla @@ -1 +1 @@ -Subproject commit 8c58d0994cd512263e34db1c8f45c1f1a9689a58 +Subproject commit 76cdd50bfa8c3e7c96bb33c239916b0e28e2ce92 diff --git a/deps/PawPaw b/deps/PawPaw index 75d86db..b4c1de9 160000 --- a/deps/PawPaw +++ b/deps/PawPaw @@ -1 +1 @@ -Subproject commit 75d86db5d171228247e1297d13090cb11220fe92 +Subproject commit b4c1de98b8ac60b95a7ced6959062e4e2a863fd6 diff --git a/dpf b/dpf index e24e2a4..8e0eaa4 160000 --- a/dpf +++ b/dpf @@ -1 +1 @@ -Subproject commit e24e2a42ad7e846066ceef941b96b8f90063bd87 +Subproject commit 8e0eaa4ddd9d851da00a5f96d9c6ea6bad3c5c07