Skip to content

Commit 903ad4d

Browse files
falkTXfalkTX
committed
CI rework
Signed-off-by: falkTX <[email protected]>
1 parent 01508aa commit 903ad4d

File tree

4 files changed

+49
-50
lines changed

4 files changed

+49
-50
lines changed

‎.github/workflows/build.yml‎

Lines changed: 31 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -4,74 +4,62 @@ on: [push, pull_request]
44

55
env:
66
DEBIAN_FRONTEND: noninteractive
7+
EMSCRIPTEN_VERSION: 3.1.27
78
HOMEBREW_NO_AUTO_UPDATE: 1
8-
WITH_LTO: false
9+
HOMEBREW_NO_INSTALL_CLEANUP: 1
910

1011
jobs:
11-
macos-11:
12-
runs-on: macos-11
12+
linux:
13+
strategy:
14+
matrix:
15+
include:
16+
- target: debian:11
17+
- target: debian:12
18+
- target: ubuntu:18.04
19+
- target: ubuntu:20.04
20+
- target: ubuntu:22.04
21+
runs-on: ubuntu-latest
22+
container:
23+
image: ${{ matrix.target }}
1324
steps:
1425
- uses: actions/checkout@v3
1526
- name: Set up dependencies
1627
run: |
17-
brew install fluid-synth liblo libmagic libsndfile pkg-config pyqt@5 qt@5 sdl2
18-
- name: make features
19-
run: make features
20-
- name: make
21-
run: make -j $(sysctl -n hw.logicalcpu)
22-
23-
ubuntu-20_04:
24-
runs-on: ubuntu-20.04
25-
steps:
26-
- uses: actions/checkout@v3
27-
- name: Fix GitHub's mess
28-
run: |
29-
sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
30-
sudo dpkg --add-architecture i386
31-
sudo apt-get update -qq
32-
sudo apt-get install -yqq --allow-downgrades libpcre2-8-0/focal libpcre2-16-0/focal libpcre2-32-0/focal libpcre2-posix2/focal
33-
- name: Set up dependencies
34-
run: |
35-
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
36-
sudo apt-get install -yqq g++-multilib libx11-6:i386 libxext6:i386
28+
dpkg --add-architecture i386
29+
apt-get update -qq
30+
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
31+
apt-get install -yqq libx11-6:i386 libxext6:i386
3732
# Fix 32bit bridge build
38-
sudo ln -s /usr/lib/i386-linux-gnu/libX11.so.6 /usr/lib/i386-linux-gnu/libX11.so
39-
sudo ln -s /usr/lib/i386-linux-gnu/libXext.so.6 /usr/lib/i386-linux-gnu/libXext.so
33+
ln -s /usr/lib/i386-linux-gnu/libX11.so.6 /usr/lib/i386-linux-gnu/libX11.so
34+
ln -s /usr/lib/i386-linux-gnu/libXext.so.6 /usr/lib/i386-linux-gnu/libXext.so
4035
- name: make features
4136
run: make features
4237
- name: make
4338
run: make -j $(nproc)
4439
- name: make posix32
4540
run: make posix32 -j $(nproc)
4641

47-
ubuntu-22_04:
48-
runs-on: ubuntu-22.04
42+
macos:
43+
strategy:
44+
matrix:
45+
include:
46+
#- target: macos-11
47+
- target: macos-12
48+
runs-on: ${{ matrix.target }}
4949
steps:
5050
- uses: actions/checkout@v3
51-
- name: Fix GitHub's mess
52-
run: |
53-
sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
54-
sudo dpkg --add-architecture i386
55-
sudo apt-get update -qq
56-
sudo apt-get install -yqq --allow-downgrades libc6:i386 libgcc-s1:i386 libstdc++6:i386
51+
with:
52+
submodules: recursive
5753
- name: Set up dependencies
5854
run: |
59-
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
60-
sudo apt-get install -yqq g++-multilib libx11-6:i386 libxext6:i386
61-
# Fix 32bit bridge build
62-
sudo ln -s /usr/lib/i386-linux-gnu/libX11.so.6 /usr/lib/i386-linux-gnu/libX11.so
63-
sudo ln -s /usr/lib/i386-linux-gnu/libXext.so.6 /usr/lib/i386-linux-gnu/libXext.so
55+
brew install fluid-synth liblo libmagic libsndfile pkg-config pyqt@5 qt@5 sdl2
6456
- name: make features
6557
run: make features
6658
- name: make
67-
run: make -j $(nproc)
68-
- name: make posix32
69-
run: make posix32 -j $(nproc)
59+
run: make -j $(sysctl -n hw.logicalcpu)
7060

7161
wasm:
7262
runs-on: ubuntu-22.04
73-
env:
74-
EMSCRIPTEN_VERSION: 3.1.27
7563
steps:
7664
- uses: actions/checkout@v3
7765
with:

‎.github/workflows/cmake.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
include:
1313
- container: debian:11
1414
- container: debian:12
15-
- container: ubuntu:20.04
15+
#- container: ubuntu:20.04
1616
- container: ubuntu:22.04
1717
- container: ubuntu:23.10
1818
runs-on: ubuntu-latest
@@ -68,9 +68,9 @@ jobs:
6868
strategy:
6969
matrix:
7070
include:
71-
#- container: debian:11
71+
- container: debian:11
7272
- container: debian:12
73-
- container: ubuntu:20.04
73+
#- container: ubuntu:20.04
7474
- container: ubuntu:22.04
7575
- container: ubuntu:23.10
7676
runs-on: ubuntu-latest
@@ -106,9 +106,9 @@ jobs:
106106
strategy:
107107
matrix:
108108
include:
109-
#- container: debian:11
109+
- container: debian:11
110110
- container: debian:12
111-
- container: ubuntu:20.04
111+
#- container: ubuntu:20.04
112112
- container: ubuntu:22.04
113113
- container: ubuntu:23.10
114114
runs-on: ubuntu-latest

‎.github/workflows/dpf.yml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@ name: dpf
22

33
on: [push, pull_request]
44

5+
env:
6+
PAWPAW_SKIP_LTO: 1
7+
PAWPAW_SKIP_TESTS: 1
8+
59
jobs:
610
linux:
711
strategy:
@@ -22,7 +26,7 @@ jobs:
2226
macos:
2327
strategy:
2428
matrix:
25-
target: [macos-intel, macos-universal]
29+
target: [macos-intel, macos-universal, macos-universal-10.15]
2630
runs-on: macos-11
2731
steps:
2832
- uses: actions/checkout@v3

‎.github/workflows/release.yml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,12 @@ on: [push, pull_request]
44

55
env:
66
CACHE_VERSION: 1
7+
DEBIAN_FRONTEND: noninteractive
8+
HOMEBREW_NO_AUTO_UPDATE: 1
9+
HOMEBREW_NO_INSTALL_CLEANUP: 1
710
PAWPAW_SKIP_LTO: 1
8-
PAWPAW_VERSION: cd7b760d6a32ecad263b112c12be8a306ed1e89c
11+
PAWPAW_SKIP_TESTS: 1
12+
PAWPAW_VERSION: 9534e2b4f9bafc993e05fada89b824f3a2176708
913

1014
jobs:
1115
# macOS native universal build
@@ -29,6 +33,7 @@ jobs:
2933
run: |
3034
git clone https://github.com/DISTRHO/PawPaw.git
3135
git -C PawPaw checkout ${{ env.PAWPAW_VERSION }}
36+
./PawPaw/.github/workflows/bootstrap-deps.sh macos-universal
3237
./PawPaw/bootstrap-carla.sh macos-universal && ./PawPaw/.cleanup.sh macos-universal
3338
- name: Build macOS universal
3439
shell: bash
@@ -92,6 +97,7 @@ jobs:
9297
run: |
9398
git clone https://github.com/DISTRHO/PawPaw.git
9499
git -C PawPaw checkout ${{ env.PAWPAW_VERSION }}
100+
./PawPaw/.github/workflows/bootstrap-deps.sh win32
95101
./PawPaw/bootstrap-carla.sh win32 && ./PawPaw/.cleanup.sh win32
96102
- name: Build win32 cross-compiled
97103
shell: bash
@@ -155,6 +161,7 @@ jobs:
155161
run: |
156162
git clone https://github.com/DISTRHO/PawPaw.git
157163
git -C PawPaw checkout ${{ env.PAWPAW_VERSION }}
164+
./PawPaw/.github/workflows/bootstrap-deps.sh win64
158165
./PawPaw/bootstrap-carla.sh win64 && ./PawPaw/.cleanup.sh win64
159166
- name: Build win64 cross-compiled
160167
shell: bash

0 commit comments

Comments
 (0)