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

Generate mini variant modgui during wasm builds

Browse source 
Signed-off-by: falkTX <falktx@falktx.com>
This commit is contained in:
falkTX 2022-12-29 02:33:57 +00:00
parent c23230297c
commit 6372e23963
No known key found for this signature in database
GPG key ID: CDBAA37ABC74FBA0
3 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -800,17 +800,17 @@ jobs:
pushd deps/PawPaw; source local.env wasm; popd pushd deps/PawPaw; source local.env wasm; popd
make features 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)
make CIBUILD=true HAVE_LIBLO=false NOOPT=true USE_GLES2=true -j $(nproc) -C CardinalMini modgui
- name: Make wasm versioned and compress - name: Make wasm versioned and compress
if: steps.cache.outputs.cache-hit == 'true' if: steps.cache.outputs.cache-hit == 'true'
run: | run: |
VERSION=$(cat Makefile | awk 'sub("VERSION = ","")') VERSION=$(cat Makefile | awk 'sub("VERSION = ","")')
cd bin cd bin
rm -r *.lv2
sed -i "s/CardinalNative\./CardinalNative-v${VERSION}\./g" *.html *.js sed -i "s/CardinalNative\./CardinalNative-v${VERSION}\./g" *.html *.js
mv CardinalNative.data CardinalNative-v${VERSION}.data mv CardinalNative.data CardinalNative-v${VERSION}.data
mv CardinalNative.js CardinalNative-v${VERSION}.js mv CardinalNative.js CardinalNative-v${VERSION}.js
mv CardinalNative.wasm CardinalNative-v${VERSION}.wasm mv CardinalNative.wasm CardinalNative-v${VERSION}.wasm
brotli -k -q 11 *.* brotli -k -q 11 *.data *.html *.js *.wasm
- name: Set sha8 (non-release) - name: Set sha8 (non-release)
if: startsWith(github.ref, 'refs/tags/') != true if: startsWith(github.ref, 'refs/tags/') != true
run: echo "SHA8=$(echo ${{ github.sha }} | cut -c1-8)" >> $GITHUB_ENV run: echo "SHA8=$(echo ${{ github.sha }} | cut -c1-8)" >> $GITHUB_ENV
@ -820,7 +820,7 @@ jobs:
- name: Pack binaries - name: Pack binaries
if: steps.cache.outputs.cache-hit == 'true' if: steps.cache.outputs.cache-hit == 'true'
run: | 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 - uses: actions/upload-artifact@v3
with: with:
name: ${{ github.event.repository.name }}-wasm-${{ github.event.pull_request.number || env.SHA8 }} 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.data CardinalNative-v${VERSION}.data
mv CardinalNative.js CardinalNative-v${VERSION}.js mv CardinalNative.js CardinalNative-v${VERSION}.js
mv CardinalNative.wasm CardinalNative-v${VERSION}.wasm 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) - name: Set sha8 (non-release)
if: startsWith(github.ref, 'refs/tags/') != true if: startsWith(github.ref, 'refs/tags/') != true
run: echo "SHA8=$(echo ${{ github.sha }} | cut -c1-8)" >> $GITHUB_ENV run: echo "SHA8=$(echo ${{ github.sha }} | cut -c1-8)" >> $GITHUB_ENV

2
dpf

@ -1 +1 @@
Subproject commit 55ab560e3cf8c408cd7e36d847cf2c1a34cf59e5 Subproject commit 8eb504d3eb6b4f9984503bedfbd3c02b7cb63d2b

3
src/Makefile
View file

@ -235,10 +235,11 @@ ifeq ($(MOD_BUILD),true)
$(MAKE) -C CardinalMini lv2 $(MAKE) -C CardinalMini lv2
else ifeq ($(WASM),true) else ifeq ($(WASM),true)
$(MAKE) -C CardinalNative $(MAKE) -C CardinalNative
# $(MAKE) -C CardinalMini modgui
else else
$(MAKE) -C Cardinal $(MAKE) -C Cardinal
ifneq ($(NOPLUGINS),true)
$(MAKE) -C CardinalMini $(MAKE) -C CardinalMini
endif
$(MAKE) -C CardinalNative $(MAKE) -C CardinalNative
$(MAKE) -C CardinalFX $(CARDINAL_FX_ARGS) $(MAKE) -C CardinalFX $(CARDINAL_FX_ARGS)
$(MAKE) -C CardinalSynth $(CARDINAL_SYNTH_ARGS) $(MAKE) -C CardinalSynth $(CARDINAL_SYNTH_ARGS)