diff --git a/.github/workflows/bootstrap.yml b/.github/workflows/bootstrap.yml index b9cccae..3419d75 100644 --- a/.github/workflows/bootstrap.yml +++ b/.github/workflows/bootstrap.yml @@ -89,7 +89,6 @@ jobs: if: ${{ matrix.installer == 'apt' }} run: | sudo apt-get update -qq - sudo apt-get install -yqq --allow-downgrades autoconf automake autopoint build-essential curl cmake git jq meson # extra, for using system libraries if [ '${{ matrix.target }}' == 'linux-aarch64' ]; then sudo dpkg --add-architecture arm64 @@ -144,6 +143,7 @@ jobs: sudo apt-get update -qq sudo apt-get install -yqq --allow-downgrades libc6:i386 libgcc-s1:i386 libstdc++6:i386 binutils-mingw-w64-x86-64 g++-mingw-w64-x86-64 mingw-w64 gperf wine-stable fi + sudo apt-get install -yqq --allow-downgrades autoconf automake autopoint build-essential curl cmake git jq meson - name: (homebrew) Set up dependencies if: ${{ matrix.installer == 'homebrew' }} run: | @@ -169,34 +169,38 @@ jobs: name: common-${{ matrix.target }} path: common-${{ matrix.target }}.tar.gz - cardinal: + plugins: strategy: matrix: include: - name: linux-aarch64 installer: apt - os: ubuntu-20.04 + os: ubuntu-22.04 target: linux-aarch64 - name: linux-armhf installer: apt - os: ubuntu-20.04 + os: ubuntu-22.04 target: linux-armhf - name: linux-i686 installer: apt - os: ubuntu-20.04 + os: ubuntu-22.04 target: linux-i686 - name: linux-riscv64 installer: apt - os: ubuntu-20.04 + os: ubuntu-22.04 target: linux-riscv64 - name: linux-x86_64 installer: apt - os: ubuntu-20.04 + os: ubuntu-22.04 target: linux-x86_64 - name: macos installer: homebrew os: macos-11 target: macos + - name: macos-universal + installer: homebrew + os: macos-11 + target: macos-universal - name: macos-universal-10.15 installer: homebrew os: macos-11 @@ -214,6 +218,7 @@ jobs: os: ubuntu-22.04 target: win64 runs-on: ${{ matrix.os }} + needs: common steps: - uses: actions/checkout@v3 - name: Set up cache @@ -221,7 +226,7 @@ jobs: with: path: | ~/PawPawBuilds - key: cardinal-${{ matrix.target }}-v${{ env.CACHE_VERSION }} + key: plugins-${{ matrix.target }}-v${{ env.CACHE_VERSION }} - name: (apt) Restore debian package cache if: ${{ matrix.installer == 'apt' }} run: | @@ -246,7 +251,6 @@ jobs: if: ${{ matrix.installer == 'apt' }} run: | sudo apt-get update -qq - sudo apt-get install -yqq --allow-downgrades autoconf automake autopoint build-essential curl cmake git jq meson # extra, for using system libraries if [ '${{ matrix.target }}' == 'linux-aarch64' ]; then sudo dpkg --add-architecture arm64 @@ -301,6 +305,7 @@ jobs: sudo apt-get update -qq sudo apt-get install -yqq --allow-downgrades libc6:i386 libgcc-s1:i386 libstdc++6:i386 binutils-mingw-w64-x86-64 g++-mingw-w64-x86-64 mingw-w64 gperf wine-stable fi + sudo apt-get install -yqq --allow-downgrades autoconf automake autopoint build-essential curl cmake git jq meson - name: (homebrew) Set up dependencies if: ${{ matrix.installer == 'homebrew' }} run: | @@ -310,38 +315,36 @@ jobs: run: | mkdir -p ~/PawPawBuilds/debs sudo mv /var/cache/apt/archives/*.deb ~/PawPawBuilds/debs/ + - name: Download common-${{ matrix.target }} + uses: actions/download-artifact@v3 + with: + name: common-${{ matrix.target }} + path: ~/PawPawBuilds + - name: Extract common-${{ matrix.target }} + shell: bash + run: | + cd ~/PawPawBuilds && \ + tar xf common-${{ matrix.target }}.tar.gz - name: Run bootstrap shell: bash run: | if [ '${{ matrix.target }}' == 'wasm' ]; then \ source ~/PawPawBuilds/emsdk/emsdk_env.sh; \ fi - ./bootstrap-cardinal.sh ${{ matrix.target }} && ./.cleanup.sh ${{ matrix.target }} + ./bootstrap-plugins.sh ${{ matrix.target }} && ./.cleanup.sh ${{ matrix.target }} + - name: Pack bootstrap build + shell: bash + run: | + tar -C ~/PawPawBuilds -czf plugins-${{ matrix.target }}.tar.gz builds targets + - uses: actions/upload-artifact@v3 + with: + name: plugins-${{ matrix.target }} + path: plugins-${{ matrix.target }}.tar.gz - plugins: + jack2: strategy: matrix: include: - - name: linux-aarch64 - installer: apt - os: ubuntu-22.04 - target: linux-aarch64 - - name: linux-armhf - installer: apt - os: ubuntu-22.04 - target: linux-armhf - - name: linux-i686 - installer: apt - os: ubuntu-22.04 - target: linux-i686 - - name: linux-riscv64 - installer: apt - os: ubuntu-22.04 - target: linux-riscv64 - - name: linux-x86_64 - installer: apt - os: ubuntu-22.04 - target: linux-x86_64 - name: macos installer: homebrew os: macos-11 @@ -354,10 +357,6 @@ jobs: installer: homebrew os: macos-11 target: macos-universal-10.15 - - name: wasm - installer: apt - os: ubuntu-22.04 - target: wasm - name: win32 installer: apt os: ubuntu-22.04 @@ -375,7 +374,7 @@ jobs: with: path: | ~/PawPawBuilds - key: plugins-${{ matrix.target }}-v${{ env.CACHE_VERSION }} + key: jack2-${{ matrix.target }}-v${{ env.CACHE_VERSION }} - name: (apt) Restore debian package cache if: ${{ matrix.installer == 'apt' }} run: | @@ -400,7 +399,6 @@ jobs: if: ${{ matrix.installer == 'apt' }} run: | sudo apt-get update -qq - sudo apt-get install -yqq --allow-downgrades autoconf automake autopoint build-essential curl cmake git jq meson # extra, for using system libraries if [ '${{ matrix.target }}' == 'linux-aarch64' ]; then sudo dpkg --add-architecture arm64 @@ -455,6 +453,7 @@ jobs: sudo apt-get update -qq sudo apt-get install -yqq --allow-downgrades libc6:i386 libgcc-s1:i386 libstdc++6:i386 binutils-mingw-w64-x86-64 g++-mingw-w64-x86-64 mingw-w64 gperf wine-stable fi + sudo apt-get install -yqq --allow-downgrades autoconf automake autopoint build-essential curl cmake git jq meson - name: (homebrew) Set up dependencies if: ${{ matrix.installer == 'homebrew' }} run: | @@ -477,20 +476,17 @@ jobs: - name: Run bootstrap shell: bash run: | - if [ '${{ matrix.target }}' == 'wasm' ]; then \ - source ~/PawPawBuilds/emsdk/emsdk_env.sh; \ - fi - ./bootstrap-plugins.sh ${{ matrix.target }} && ./.cleanup.sh ${{ matrix.target }} + ./bootstrap-jack2.sh ${{ matrix.target }} && ./.cleanup.sh ${{ matrix.target }} - name: Pack bootstrap build shell: bash run: | - tar -C ~/PawPawBuilds -czf plugins-${{ matrix.target }}.tar.gz builds targets + tar -C ~/PawPawBuilds -czf jack2-${{ matrix.target }}.tar.gz builds targets - uses: actions/upload-artifact@v3 with: - name: plugins-${{ matrix.target }} - path: plugins-${{ matrix.target }}.tar.gz + name: jack2-${{ matrix.target }} + path: jack2-${{ matrix.target }}.tar.gz - jack2: + qt: strategy: matrix: include: @@ -523,7 +519,7 @@ jobs: with: path: | ~/PawPawBuilds - key: jack2-${{ matrix.target }}-v${{ env.CACHE_VERSION }} + key: qt-${{ matrix.target }}-v${{ env.CACHE_VERSION }} - name: (apt) Restore debian package cache if: ${{ matrix.installer == 'apt' }} run: | @@ -548,7 +544,6 @@ jobs: if: ${{ matrix.installer == 'apt' }} run: | sudo apt-get update -qq - sudo apt-get install -yqq --allow-downgrades autoconf automake autopoint build-essential curl cmake git jq meson # extra, for using system libraries if [ '${{ matrix.target }}' == 'linux-aarch64' ]; then sudo dpkg --add-architecture arm64 @@ -603,6 +598,7 @@ jobs: sudo apt-get update -qq sudo apt-get install -yqq --allow-downgrades libc6:i386 libgcc-s1:i386 libstdc++6:i386 binutils-mingw-w64-x86-64 g++-mingw-w64-x86-64 mingw-w64 gperf wine-stable fi + sudo apt-get install -yqq --allow-downgrades autoconf automake autopoint build-essential curl cmake git jq meson - name: (homebrew) Set up dependencies if: ${{ matrix.installer == 'homebrew' }} run: | @@ -625,32 +621,28 @@ jobs: - name: Run bootstrap shell: bash run: | - ./bootstrap-jack2.sh ${{ matrix.target }} && ./.cleanup.sh ${{ matrix.target }} + ./bootstrap-qt.sh ${{ matrix.target }} && ./.cleanup.sh ${{ matrix.target }} - name: Pack bootstrap build shell: bash run: | - tar -C ~/PawPawBuilds -czf jack2-${{ matrix.target }}.tar.gz builds targets + tar -C ~/PawPawBuilds -czf qt-${{ matrix.target }}.tar.gz builds targets - uses: actions/upload-artifact@v3 with: - name: jack2-${{ matrix.target }} - path: jack2-${{ matrix.target }}.tar.gz + name: qt-${{ matrix.target }} + path: qt-${{ matrix.target }}.tar.gz - qt: + carla: strategy: matrix: include: - - name: macos - installer: homebrew - os: macos-11 - target: macos + #- name: macos + #installer: homebrew + #os: macos-11 + #target: macos - name: macos-universal installer: homebrew os: macos-11 target: macos-universal - - name: macos-universal-10.15 - installer: homebrew - os: macos-11 - target: macos-universal-10.15 - name: win32 installer: apt os: ubuntu-22.04 @@ -660,7 +652,7 @@ jobs: os: ubuntu-22.04 target: win64 runs-on: ${{ matrix.os }} - needs: common + needs: [plugins, qt] steps: - uses: actions/checkout@v3 - name: Set up cache @@ -668,7 +660,7 @@ jobs: with: path: | ~/PawPawBuilds - key: qt-${{ matrix.target }}-v${{ env.CACHE_VERSION }} + key: carla-${{ matrix.target }}-v${{ env.CACHE_VERSION }} - name: (apt) Restore debian package cache if: ${{ matrix.installer == 'apt' }} run: | @@ -693,7 +685,6 @@ jobs: if: ${{ matrix.installer == 'apt' }} run: | sudo apt-get update -qq - sudo apt-get install -yqq --allow-downgrades autoconf automake autopoint build-essential curl cmake git jq meson # extra, for using system libraries if [ '${{ matrix.target }}' == 'linux-aarch64' ]; then sudo dpkg --add-architecture arm64 @@ -748,6 +739,7 @@ jobs: sudo apt-get update -qq sudo apt-get install -yqq --allow-downgrades libc6:i386 libgcc-s1:i386 libstdc++6:i386 binutils-mingw-w64-x86-64 g++-mingw-w64-x86-64 mingw-w64 gperf wine-stable fi + sudo apt-get install -yqq --allow-downgrades autoconf automake autopoint build-essential curl cmake git jq meson - name: (homebrew) Set up dependencies if: ${{ matrix.installer == 'homebrew' }} run: | @@ -762,36 +754,65 @@ jobs: with: name: common-${{ matrix.target }} path: ~/PawPawBuilds - - name: Extract common-${{ matrix.target }} + - name: Download qt-${{ matrix.target }} + uses: actions/download-artifact@v3 + with: + name: qt-${{ matrix.target }} + path: ~/PawPawBuilds + - name: Download plugins-${{ matrix.target }} + uses: actions/download-artifact@v3 + with: + name: plugins-${{ matrix.target }} + path: ~/PawPawBuilds + - name: Extract {common,plugins,qt}-${{ matrix.target }} shell: bash run: | cd ~/PawPawBuilds && \ - tar xf common-${{ matrix.target }}.tar.gz + tar xf common-${{ matrix.target }}.tar.gz && \ + tar xf plugins-${{ matrix.target }}.tar.gz && \ + tar xf qt-${{ matrix.target }}.tar.gz - name: Run bootstrap shell: bash run: | - ./bootstrap-qt.sh ${{ matrix.target }} && ./.cleanup.sh ${{ matrix.target }} - - name: Pack bootstrap build - shell: bash - run: | - tar -C ~/PawPawBuilds -czf qt-${{ matrix.target }}.tar.gz builds targets - - uses: actions/upload-artifact@v3 - with: - name: qt-${{ matrix.target }} - path: qt-${{ matrix.target }}.tar.gz + ./bootstrap-carla.sh ${{ matrix.target }} && ./.cleanup.sh ${{ matrix.target }} - carla: + cardinal: + env: + PAWPAW_SKIP_LTO: 1 + PAWPAW_SKIP_GLIB: 1 + PAWPAW_SKIP_LV2: 1 + PAWPAW_SKIP_SAMPLERATE: 1 strategy: matrix: include: - #- name: macos - #installer: homebrew - #os: macos-11 - #target: macos - - name: macos-universal + - name: linux-aarch64 + installer: apt + os: ubuntu-20.04 + target: linux-aarch64 + - name: linux-armhf + installer: apt + os: ubuntu-20.04 + target: linux-armhf + - name: linux-i686 + installer: apt + os: ubuntu-20.04 + target: linux-i686 + - name: linux-riscv64 + installer: apt + os: ubuntu-20.04 + target: linux-riscv64 + - name: linux-x86_64 + installer: apt + os: ubuntu-20.04 + target: linux-x86_64 + - name: macos-universal-10.15 installer: homebrew os: macos-11 - target: macos-universal + target: macos-universal-10.15 + - name: wasm + installer: apt + os: ubuntu-22.04 + target: wasm - name: win32 installer: apt os: ubuntu-22.04 @@ -801,7 +822,6 @@ jobs: os: ubuntu-22.04 target: win64 runs-on: ${{ matrix.os }} - needs: [plugins, qt] steps: - uses: actions/checkout@v3 - name: Set up cache @@ -809,7 +829,7 @@ jobs: with: path: | ~/PawPawBuilds - key: carla-${{ matrix.target }}-v${{ env.CACHE_VERSION }} + key: cardinal-${{ matrix.target }}-v${{ env.CACHE_VERSION }} - name: (apt) Restore debian package cache if: ${{ matrix.installer == 'apt' }} run: | @@ -834,7 +854,6 @@ jobs: if: ${{ matrix.installer == 'apt' }} run: | sudo apt-get update -qq - sudo apt-get install -yqq --allow-downgrades autoconf automake autopoint build-essential curl cmake git jq meson # extra, for using system libraries if [ '${{ matrix.target }}' == 'linux-aarch64' ]; then sudo dpkg --add-architecture arm64 @@ -889,6 +908,7 @@ jobs: sudo apt-get update -qq sudo apt-get install -yqq --allow-downgrades libc6:i386 libgcc-s1:i386 libstdc++6:i386 binutils-mingw-w64-x86-64 g++-mingw-w64-x86-64 mingw-w64 gperf wine-stable fi + sudo apt-get install -yqq --allow-downgrades autoconf automake autopoint build-essential curl cmake git jq meson - name: (homebrew) Set up dependencies if: ${{ matrix.installer == 'homebrew' }} run: | @@ -898,32 +918,13 @@ jobs: run: | mkdir -p ~/PawPawBuilds/debs sudo mv /var/cache/apt/archives/*.deb ~/PawPawBuilds/debs/ - - name: Download common-${{ matrix.target }} - uses: actions/download-artifact@v3 - with: - name: common-${{ matrix.target }} - path: ~/PawPawBuilds - - name: Download qt-${{ matrix.target }} - uses: actions/download-artifact@v3 - with: - name: qt-${{ matrix.target }} - path: ~/PawPawBuilds - - name: Download plugins-${{ matrix.target }} - uses: actions/download-artifact@v3 - with: - name: plugins-${{ matrix.target }} - path: ~/PawPawBuilds - - name: Extract {common,plugins,qt}-${{ matrix.target }} - shell: bash - run: | - cd ~/PawPawBuilds && \ - tar xf common-${{ matrix.target }}.tar.gz && \ - tar xf plugins-${{ matrix.target }}.tar.gz && \ - tar xf qt-${{ matrix.target }}.tar.gz - name: Run bootstrap shell: bash run: | - ./bootstrap-carla.sh ${{ matrix.target }} && ./.cleanup.sh ${{ matrix.target }} + if [ '${{ matrix.target }}' == 'wasm' ]; then \ + source ~/PawPawBuilds/emsdk/emsdk_env.sh; \ + fi + ./bootstrap-cardinal.sh ${{ matrix.target }} && ./.cleanup.sh ${{ matrix.target }} modaudio: strategy: @@ -938,7 +939,6 @@ jobs: os: ubuntu-22.04 target: win64 runs-on: ${{ matrix.os }} - needs: [plugins, qt] steps: - uses: actions/checkout@v3 - name: Set up cache @@ -971,7 +971,6 @@ jobs: if: ${{ matrix.installer == 'apt' }} run: | sudo apt-get update -qq - sudo apt-get install -yqq --allow-downgrades autoconf automake autopoint build-essential curl cmake git jq meson # extra, for using system libraries if [ '${{ matrix.target }}' == 'linux-aarch64' ]; then sudo dpkg --add-architecture arm64 @@ -1026,6 +1025,7 @@ jobs: sudo apt-get update -qq sudo apt-get install -yqq --allow-downgrades libc6:i386 libgcc-s1:i386 libstdc++6:i386 binutils-mingw-w64-x86-64 g++-mingw-w64-x86-64 mingw-w64 gperf wine-stable fi + sudo apt-get install -yqq --allow-downgrades autoconf automake autopoint build-essential curl cmake git jq meson - name: (homebrew) Set up dependencies if: ${{ matrix.installer == 'homebrew' }} run: | @@ -1035,28 +1035,6 @@ jobs: run: | mkdir -p ~/PawPawBuilds/debs sudo mv /var/cache/apt/archives/*.deb ~/PawPawBuilds/debs/ - - name: Download common-${{ matrix.target }} - uses: actions/download-artifact@v3 - with: - name: common-${{ matrix.target }} - path: ~/PawPawBuilds - - name: Download qt-${{ matrix.target }} - uses: actions/download-artifact@v3 - with: - name: qt-${{ matrix.target }} - path: ~/PawPawBuilds - - name: Download plugins-${{ matrix.target }} - uses: actions/download-artifact@v3 - with: - name: plugins-${{ matrix.target }} - path: ~/PawPawBuilds - - name: Extract {common,plugins,qt}-${{ matrix.target }} - shell: bash - run: | - cd ~/PawPawBuilds && \ - tar xf common-${{ matrix.target }}.tar.gz && \ - tar xf plugins-${{ matrix.target }}.tar.gz && \ - tar xf qt-${{ matrix.target }}.tar.gz - name: Run bootstrap shell: bash run: |