diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index efda263..6e189b8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -800,17 +800,17 @@ jobs: pushd deps/PawPaw; source local.env wasm; popd make features make CIBUILD=true HAVE_LIBLO=false NOOPT=true USE_GLES2=true -j $(nproc) + make CIBUILD=true HAVE_LIBLO=false NOOPT=true USE_GLES2=true -j $(nproc) -C CardinalMini modgui - name: Make wasm versioned and compress if: steps.cache.outputs.cache-hit == 'true' run: | VERSION=$(cat Makefile | awk 'sub("VERSION = ","")') cd bin - rm -r *.lv2 sed -i "s/CardinalNative\./CardinalNative-v${VERSION}\./g" *.html *.js mv CardinalNative.data CardinalNative-v${VERSION}.data mv CardinalNative.js CardinalNative-v${VERSION}.js mv CardinalNative.wasm CardinalNative-v${VERSION}.wasm - brotli -k -q 11 *.* + brotli -k -q 11 *.data *.html *.js *.wasm - name: Set sha8 (non-release) if: startsWith(github.ref, 'refs/tags/') != true run: echo "SHA8=$(echo ${{ github.sha }} | cut -c1-8)" >> $GITHUB_ENV @@ -820,7 +820,7 @@ jobs: - name: Pack binaries if: steps.cache.outputs.cache-hit == 'true' run: | - cd bin; zip -r -9 ../${{ github.event.repository.name }}-wasm-${{ github.event.pull_request.number || env.SHA8 }}.zip $(ls *.br *.html *.data *.js *.wasm) + cd bin; zip -r -9 ../${{ github.event.repository.name }}-wasm-${{ github.event.pull_request.number || env.SHA8 }}.zip $(ls *.br *.html *.data *.js *.wasm) CardinalMini.lv2/modgui - uses: actions/upload-artifact@v3 with: name: ${{ github.event.repository.name }}-wasm-${{ github.event.pull_request.number || env.SHA8 }} @@ -887,7 +887,7 @@ jobs: mv CardinalNative.data CardinalNative-v${VERSION}.data mv CardinalNative.js CardinalNative-v${VERSION}.js mv CardinalNative.wasm CardinalNative-v${VERSION}.wasm - brotli -k -q 11 *.* + brotli -k -q 11 brotli -k -q 11 *.data *.html *.js *.wasm - name: Set sha8 (non-release) if: startsWith(github.ref, 'refs/tags/') != true run: echo "SHA8=$(echo ${{ github.sha }} | cut -c1-8)" >> $GITHUB_ENV diff --git a/dpf b/dpf index 55ab560..8eb504d 160000 --- a/dpf +++ b/dpf @@ -1 +1 @@ -Subproject commit 55ab560e3cf8c408cd7e36d847cf2c1a34cf59e5 +Subproject commit 8eb504d3eb6b4f9984503bedfbd3c02b7cb63d2b diff --git a/src/Makefile b/src/Makefile index f8b4a34..d610fef 100644 --- a/src/Makefile +++ b/src/Makefile @@ -235,10 +235,11 @@ ifeq ($(MOD_BUILD),true) $(MAKE) -C CardinalMini lv2 else ifeq ($(WASM),true) $(MAKE) -C CardinalNative -# $(MAKE) -C CardinalMini modgui else $(MAKE) -C Cardinal +ifneq ($(NOPLUGINS),true) $(MAKE) -C CardinalMini +endif $(MAKE) -C CardinalNative $(MAKE) -C CardinalFX $(CARDINAL_FX_ARGS) $(MAKE) -C CardinalSynth $(CARDINAL_SYNTH_ARGS)