Skip to content

Commit

Permalink
Add jack-example-tools, fixup CI
Browse files Browse the repository at this point in the history 
Signed-off-by: falkTX <[email protected]>
  • Loading branch information
@falkTX
falkTX committed Feb 2, 2023
1 parent 636a893 commit 1ac1f57
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 13 deletions.
32 changes: 20 additions & 12 deletions .github/workflows/release.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,12 @@ jobs:
macos:
runs-on: macos-10.15
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
submodules: recursive
- name: Set up cache
uses: actions/cache@v2
uses: actions/cache@v3
id: cache
with:
path: |
~/PawPawBuilds
Expand All @@ -32,12 +33,13 @@ jobs:
./PawPaw/bootstrap-jack2.sh macos && ./PawPaw/bootstrap-qt.sh macos && ./PawPaw/.cleanup.sh macos
- name: Build macOS intel
shell: bash
if: steps.cache.outputs.cache-hit == 'true'
run: |
./pack-jack2-version.sh macos
- name: Set sha8
id: slug
run: echo "::set-output name=sha8::$(echo ${{ github.sha }} | cut -c1-8)"
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v3
with:
name: jack2-macOS-intel-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}
path: PawPaw/jack2-macOS-*.tar.gz
Expand All @@ -55,11 +57,12 @@ jobs:
macos_universal:
runs-on: macos-10.15
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
submodules: recursive
- name: Set up cache
uses: actions/cache@v2
uses: actions/cache@v3
id: cache
with:
path: |
~/PawPawBuilds
Expand All @@ -77,12 +80,13 @@ jobs:
./PawPaw/bootstrap-jack2.sh macos-universal && ./PawPaw/bootstrap-qt.sh macos-universal && ./PawPaw/.cleanup.sh macos-universal
- name: Build macOS universal
shell: bash
if: steps.cache.outputs.cache-hit == 'true'
run: |
./pack-jack2-version.sh macos-universal
- name: Set sha8
id: slug
run: echo "::set-output name=sha8::$(echo ${{ github.sha }} | cut -c1-8)"
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v3
with:
name: jack2-macOS-universal-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}
path: PawPaw/jack2-macOS-*.tar.gz
Expand All @@ -100,11 +104,12 @@ jobs:
win32:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
submodules: recursive
- name: Set up cache
uses: actions/cache@v2
uses: actions/cache@v3
id: cache
with:
path: |
~/PawPawBuilds
Expand Down Expand Up @@ -136,12 +141,13 @@ jobs:
./PawPaw/bootstrap-jack2.sh win32 && ./PawPaw/bootstrap-qt.sh win32 && ./PawPaw/.cleanup.sh win32
- name: Build win32 cross-compiled
shell: bash
if: steps.cache.outputs.cache-hit == 'true'
run: |
xvfb-run ./pack-jack2-version.sh win32
- name: Set sha8
id: slug
run: echo "::set-output name=sha8::$(echo ${{ github.sha }} | cut -c1-8)"
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v3
with:
name: jack2-win32-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}
path: PawPaw/jack2-win*.exe
Expand All @@ -159,11 +165,12 @@ jobs:
win64:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
submodules: recursive
- name: Set up cache
uses: actions/cache@v2
uses: actions/cache@v3
id: cache
with:
path: |
~/PawPawBuilds
Expand Down Expand Up @@ -195,12 +202,13 @@ jobs:
./PawPaw/bootstrap-jack2.sh win64 && ./PawPaw/bootstrap-qt.sh win64 && ./PawPaw/.cleanup.sh win64
- name: Build win64 cross-compiled
shell: bash
if: steps.cache.outputs.cache-hit == 'true'
run: |
xvfb-run ./pack-jack2-version.sh win64
- name: Set sha8
id: slug
run: echo "::set-output name=sha8::$(echo ${{ github.sha }} | cut -c1-8)"
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v3
with:
name: jack2-win64-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}
path: PawPaw/jack2-win*.exe
Expand Down
2 changes: 1 addition & 1 deletion PawPaw
Submodule PawPaw updated 57 files
+483 −154 .github/workflows/bootstrap.yml
+6 −25 bootstrap-cardinal.sh
+115 −80 bootstrap-carla.sh
+48 −6 bootstrap-common.sh
+4 −0 bootstrap-jack2.sh
+292 −29 bootstrap-plugins.sh
+33 −10 bootstrap-qt.sh
+46 −9 build-jack2.sh
+11 −1 local.env
+0 −0 patches/Python/macos-universal
+26 −0 patches/Python/macos/01_fix-build-triplet.patch
+31 −16 patches/Python/win32/9001-pawpaw-needed-changes.patch
+36 −0 patches/cairo/01_undef-zlib-deflate-macro.patch
+19 −0 patches/flac/9001-fix-libs.patch
+62 −0 patches/flac/9002-hidden-flac-api.patch
+20 −0 patches/fluidsynth/01_force-empty-libsuffix.patch
+0 −0 patches/fluidsynth/03_skip-drivers-build.patch
+31 −0 patches/fluidsynth/04_hidden-fluidsynth-api.patch
+13 −0 patches/fluidsynth/wasm/11_skip-bigendian-check.patch
+53 −0 patches/fomp/wasm/11_wasm-setup.patch
+32 −0 patches/fontconfig/01_win32-local-address-handle.patch
+22 −0 patches/fontconfig/02_skip-tests.patch
+13 −0 patches/fontconfig/03_fix-wasm-build.patch
+1 −0 patches/glib/wasm-2.45/01_skip-gettext.patch
+83 −0 patches/glib/wasm-2.45/02_fix-build.patch
+1 −0 patches/glib/wasm/01_skip-gettext.patch
+53 −0 patches/glib/wasm/02_fix-build.patch
+18 −0 patches/glib/wasm/03_no-pthread-helper.patch
+352 −0 patches/glib/wasm/04_force-build.patch
+25 −0 patches/libffi/wasm-3.4.2/11_force-build.patch
+12 −0 patches/libsndfile/02_fix-libs.patch
+28 −0 patches/libvorbis/0001-Fix-build-failure-with-DSO-link-changes.patch
+26 −0 patches/libvorbis/0002-Avoid-SIGFPE-when-bytespersample-is-zero.patch
+28 −0 patches/libvorbis/9001-Fix-libs.patch
+0 −25 patches/lilv/linux/01_fix-build.patch
+22 −0 patches/lilv/wasm/11_fix-build.patch
+0 −9 patches/lilv/win32/01_force-libs.patch
+0 −1 patches/lilv/win64
+0 −11 patches/lv2/01_plugin-is-project.patch
+0 −54 patches/lv2/03_lv2-validate-without-example-plugins.patch
+15 −0 patches/lv2/wasm/11_emscripten-keep-alive.patch
+53 −0 patches/mda-lv2/wasm/11_wasm-setup.patch
+0 −14 patches/mod-sdk/01_add-makefile.patch
+10 −0 patches/opus/01_force-libs.patch
+23 −0 patches/opus/02_hidden-opus-api.patch
+13 −0 patches/pixman/01_wasm-missing-sse2-calls-workaround.patch
+17 −0 patches/qtbase/macos-universal/02_fix-12.0-build.patch
+0 −71 patches/serd/c4c4ec510dbeff61982e4aee7d1b379539319cd9.patch
+22 −0 patches/serd/wasm/11_fix-build.patch
+0 −0 plugins/mda-lv2.json
+91 −7 setup/check_target.sh
+100 −40 setup/env.sh
+63 −20 setup/functions.sh
+1 −1 setup/macos/package.xml.in
+3 −3 setup/meson/macos-old.ini
+18 −0 setup/meson/wasm.ini
+44 −27 setup/versions.sh
2 changes: 2 additions & 0 deletions pack-jack2-version.sh
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#!/bin/bash

export JACK2_VERSION=v1.9.22
export JACK_EXAMPLE_TOOLS_VERSION=0c4a3df94f4f87048e101f4c5ee282ed7a1080b3
export QJACKCTL_VERSION=0.9.9

set -e
Expand All @@ -21,6 +22,7 @@ fi

rm -rf ~/PawPawBuilds/builds/*/jack-router-*
rm -rf ~/PawPawBuilds/builds/*/jack2-${JACK2_VERSION}
rm -rf ~/PawPawBuilds/builds/*/jack-example-tools-${JACK_EXAMPLE_TOOLS_VERSION}
rm -rf ~/PawPawBuilds/builds/*/qjackctl-${QJACKCTL_VERSION}

# ---------------------------------------------------------------------------------------------------------------------
Expand Down

0 comments on commit 1ac1f57

Please sign in to comment.