From 903ad4d2a8c371cd1a85db147f99654327d4bb2c Mon Sep 17 00:00:00 2001 From: falkTX Date: Sat, 23 Dec 2023 18:55:10 +0100 Subject: [PATCH] CI rework Signed-off-by: falkTX --- .github/workflows/build.yml | 74 +++++++++++++++-------------------- .github/workflows/cmake.yml | 10 ++--- .github/workflows/dpf.yml | 6 ++- .github/workflows/release.yml | 9 ++++- 4 files changed, 49 insertions(+), 50 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 761b0cac6..57b862964 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,39 +4,34 @@ on: [push, pull_request] env: DEBIAN_FRONTEND: noninteractive + EMSCRIPTEN_VERSION: 3.1.27 HOMEBREW_NO_AUTO_UPDATE: 1 - WITH_LTO: false + HOMEBREW_NO_INSTALL_CLEANUP: 1 jobs: - macos-11: - runs-on: macos-11 + linux: + strategy: + matrix: + include: + - target: debian:11 + - target: debian:12 + - target: ubuntu:18.04 + - target: ubuntu:20.04 + - target: ubuntu:22.04 + runs-on: ubuntu-latest + container: + image: ${{ matrix.target }} steps: - uses: actions/checkout@v3 - name: Set up dependencies run: | - brew install fluid-synth liblo libmagic libsndfile pkg-config pyqt@5 qt@5 sdl2 - - name: make features - run: make features - - name: make - run: make -j $(sysctl -n hw.logicalcpu) - - ubuntu-20_04: - runs-on: ubuntu-20.04 - steps: - - uses: actions/checkout@v3 - - name: Fix GitHub's mess - run: | - sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list - sudo dpkg --add-architecture i386 - sudo apt-get update -qq - sudo apt-get install -yqq --allow-downgrades libpcre2-8-0/focal libpcre2-16-0/focal libpcre2-32-0/focal libpcre2-posix2/focal - - name: Set up dependencies - run: | - sudo apt-get install -yqq libasound2-dev libfluidsynth-dev libgl1-mesa-dev liblo-dev libmagic-dev libpulse-dev libsdl2-dev libsndfile1-dev libx11-dev libxcursor-dev libxext-dev libxrandr-dev pkg-config pyqt5-dev-tools qtbase5-dev - sudo apt-get install -yqq g++-multilib libx11-6:i386 libxext6:i386 + dpkg --add-architecture i386 + apt-get update -qq + apt-get install -yqq g++-multilib libasound2-dev libfluidsynth-dev libgl1-mesa-dev liblo-dev libmagic-dev libpulse-dev libsdl2-dev libsndfile1-dev libx11-dev libxcursor-dev libxext-dev libxrandr-dev make pkg-config pyqt5-dev-tools qtbase5-dev + apt-get install -yqq libx11-6:i386 libxext6:i386 # Fix 32bit bridge build - sudo ln -s /usr/lib/i386-linux-gnu/libX11.so.6 /usr/lib/i386-linux-gnu/libX11.so - sudo ln -s /usr/lib/i386-linux-gnu/libXext.so.6 /usr/lib/i386-linux-gnu/libXext.so + ln -s /usr/lib/i386-linux-gnu/libX11.so.6 /usr/lib/i386-linux-gnu/libX11.so + ln -s /usr/lib/i386-linux-gnu/libXext.so.6 /usr/lib/i386-linux-gnu/libXext.so - name: make features run: make features - name: make @@ -44,34 +39,27 @@ jobs: - name: make posix32 run: make posix32 -j $(nproc) - ubuntu-22_04: - runs-on: ubuntu-22.04 + macos: + strategy: + matrix: + include: + #- target: macos-11 + - target: macos-12 + runs-on: ${{ matrix.target }} steps: - uses: actions/checkout@v3 - - name: Fix GitHub's mess - run: | - sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list - sudo dpkg --add-architecture i386 - sudo apt-get update -qq - sudo apt-get install -yqq --allow-downgrades libc6:i386 libgcc-s1:i386 libstdc++6:i386 + with: + submodules: recursive - name: Set up dependencies run: | - sudo apt-get install -yqq libasound2-dev libfluidsynth-dev libgl1-mesa-dev liblo-dev libmagic-dev libpulse-dev libsdl2-dev libsndfile1-dev libx11-dev libxcursor-dev libxext-dev libxrandr-dev pkg-config pyqt5-dev-tools qtbase5-dev - sudo apt-get install -yqq g++-multilib libx11-6:i386 libxext6:i386 - # Fix 32bit bridge build - sudo ln -s /usr/lib/i386-linux-gnu/libX11.so.6 /usr/lib/i386-linux-gnu/libX11.so - sudo ln -s /usr/lib/i386-linux-gnu/libXext.so.6 /usr/lib/i386-linux-gnu/libXext.so + brew install fluid-synth liblo libmagic libsndfile pkg-config pyqt@5 qt@5 sdl2 - name: make features run: make features - name: make - run: make -j $(nproc) - - name: make posix32 - run: make posix32 -j $(nproc) + run: make -j $(sysctl -n hw.logicalcpu) wasm: runs-on: ubuntu-22.04 - env: - EMSCRIPTEN_VERSION: 3.1.27 steps: - uses: actions/checkout@v3 with: diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 562756923..f9d20b793 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -12,7 +12,7 @@ jobs: include: - container: debian:11 - container: debian:12 - - container: ubuntu:20.04 + #- container: ubuntu:20.04 - container: ubuntu:22.04 - container: ubuntu:23.10 runs-on: ubuntu-latest @@ -68,9 +68,9 @@ jobs: strategy: matrix: include: - #- container: debian:11 + - container: debian:11 - container: debian:12 - - container: ubuntu:20.04 + #- container: ubuntu:20.04 - container: ubuntu:22.04 - container: ubuntu:23.10 runs-on: ubuntu-latest @@ -106,9 +106,9 @@ jobs: strategy: matrix: include: - #- container: debian:11 + - container: debian:11 - container: debian:12 - - container: ubuntu:20.04 + #- container: ubuntu:20.04 - container: ubuntu:22.04 - container: ubuntu:23.10 runs-on: ubuntu-latest diff --git a/.github/workflows/dpf.yml b/.github/workflows/dpf.yml index fb184d617..ad12f0db7 100644 --- a/.github/workflows/dpf.yml +++ b/.github/workflows/dpf.yml @@ -2,6 +2,10 @@ name: dpf on: [push, pull_request] +env: + PAWPAW_SKIP_LTO: 1 + PAWPAW_SKIP_TESTS: 1 + jobs: linux: strategy: @@ -22,7 +26,7 @@ jobs: macos: strategy: matrix: - target: [macos-intel, macos-universal] + target: [macos-intel, macos-universal, macos-universal-10.15] runs-on: macos-11 steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0ab65ebe6..2647f4a9f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -4,8 +4,12 @@ on: [push, pull_request] env: CACHE_VERSION: 1 + DEBIAN_FRONTEND: noninteractive + HOMEBREW_NO_AUTO_UPDATE: 1 + HOMEBREW_NO_INSTALL_CLEANUP: 1 PAWPAW_SKIP_LTO: 1 - PAWPAW_VERSION: cd7b760d6a32ecad263b112c12be8a306ed1e89c + PAWPAW_SKIP_TESTS: 1 + PAWPAW_VERSION: 9534e2b4f9bafc993e05fada89b824f3a2176708 jobs: # macOS native universal build @@ -29,6 +33,7 @@ jobs: run: | git clone https://github.com/DISTRHO/PawPaw.git git -C PawPaw checkout ${{ env.PAWPAW_VERSION }} + ./PawPaw/.github/workflows/bootstrap-deps.sh macos-universal ./PawPaw/bootstrap-carla.sh macos-universal && ./PawPaw/.cleanup.sh macos-universal - name: Build macOS universal shell: bash @@ -92,6 +97,7 @@ jobs: run: | git clone https://github.com/DISTRHO/PawPaw.git git -C PawPaw checkout ${{ env.PAWPAW_VERSION }} + ./PawPaw/.github/workflows/bootstrap-deps.sh win32 ./PawPaw/bootstrap-carla.sh win32 && ./PawPaw/.cleanup.sh win32 - name: Build win32 cross-compiled shell: bash @@ -155,6 +161,7 @@ jobs: run: | git clone https://github.com/DISTRHO/PawPaw.git git -C PawPaw checkout ${{ env.PAWPAW_VERSION }} + ./PawPaw/.github/workflows/bootstrap-deps.sh win64 ./PawPaw/bootstrap-carla.sh win64 && ./PawPaw/.cleanup.sh win64 - name: Build win64 cross-compiled shell: bash