Skip to content

Commit bf4020a

Browse files
committed
Cleanup CI file, use ubuntu-20.04 as linux base
Signed-off-by: falkTX <falktx@falktx.com>
1 parent adb996e commit bf4020a

File tree

1 file changed

+17
-27
lines changed

1 file changed

+17
-27
lines changed

.github/workflows/build.yml

Lines changed: 17 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ env:
1313

1414
jobs:
1515
linux-arm64:
16-
runs-on: ubuntu-18.04
16+
runs-on: ubuntu-20.04
1717
steps:
1818
- uses: actions/checkout@v2
1919
with:
@@ -22,16 +22,11 @@ jobs:
2222
run: |
2323
sudo dpkg --add-architecture arm64
2424
sudo sed -i "s/deb http/deb [arch=amd64] http/" /etc/apt/sources.list
25-
echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports bionic main restricted universe multiverse" | sudo tee /etc/apt/sources.list.d/ports-arm64.list
26-
echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports bionic-updates main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/ports-arm64.list
27-
echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports bionic-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/ports-arm64.list
25+
echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports focal main restricted universe multiverse" | sudo tee /etc/apt/sources.list.d/ports-arm64.list
26+
echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports focal-updates main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/ports-arm64.list
27+
echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports focal-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/ports-arm64.list
2828
sudo apt-get update -qq
29-
sudo apt-get install -yq g++-aarch64-linux-gnu libasound2-dev:arm64 libcairo2-dev:arm64 libgl1-mesa-dev:arm64 liblo-dev:arm64 libpulse-dev:arm64 libx11-dev:arm64 libxcursor-dev:arm64 libxext-dev:arm64 libxrandr-dev:arm64 qemu-user-static
30-
# fix broken Ubuntu packages missing pkg-config file in multi-arch package
31-
sudo apt-get install -yq libasound2-dev libgl1-mesa-dev liblo-dev libpulse-dev libxcursor-dev libxrandr-dev
32-
sudo ln -s /usr/lib/aarch64-linux-gnu/liblo.so.7 /usr/lib/aarch64-linux-gnu/liblo.so
33-
sudo cp /usr/lib/x86_64-linux-gnu/pkgconfig/liblo.pc /usr/lib/aarch64-linux-gnu/pkgconfig/liblo.pc
34-
sudo sed -i "s/x86_64-linux-gnu/aarch64-linux-gnu/" /usr/lib/aarch64-linux-gnu/pkgconfig/liblo.pc
29+
sudo apt-get install -yqq g++-aarch64-linux-gnu libasound2-dev:arm64 libcairo2-dev:arm64 libdbus-1-dev:arm64 libgl1-mesa-dev:arm64 liblo-dev:arm64 libpulse-dev:arm64 libx11-dev:arm64 libxcursor-dev:arm64 libxext-dev:arm64 libxrandr-dev:arm64 qemu-user-static
3530
- name: Build linux arm64 cross-compiled
3631
env:
3732
CC: aarch64-linux-gnu-gcc
@@ -50,7 +45,7 @@ jobs:
5045
bin/*
5146
5247
linux-armhf:
53-
runs-on: ubuntu-18.04
48+
runs-on: ubuntu-20.04
5449
steps:
5550
- uses: actions/checkout@v2
5651
with:
@@ -63,12 +58,7 @@ jobs:
6358
echo "deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports bionic-updates main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/ports-armhf.list
6459
echo "deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports bionic-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/ports-armhf.list
6560
sudo apt-get update -qq
66-
sudo apt-get install -yq g++-arm-linux-gnueabihf libasound2-dev:armhf libcairo2-dev:armhf libgl1-mesa-dev:armhf liblo-dev:armhf libpulse-dev:armhf libx11-dev:armhf libxcursor-dev:armhf libxext-dev:armhf libxrandr-dev:armhf qemu-user-static
67-
# fix broken Ubuntu packages missing pkg-config file in multi-arch package
68-
sudo apt-get install -yq libasound2-dev libgl1-mesa-dev liblo-dev libpulse-dev libxcursor-dev libxrandr-dev
69-
sudo ln -s /usr/lib/arm-linux-gnueabihf/liblo.so.7 /usr/lib/arm-linux-gnueabihf/liblo.so
70-
sudo cp /usr/lib/x86_64-linux-gnu/pkgconfig/liblo.pc /usr/lib/arm-linux-gnueabihf/pkgconfig/liblo.pc
71-
sudo sed -i "s/x86_64-linux-gnu/arm-linux-gnueabihf/" /usr/lib/arm-linux-gnueabihf/pkgconfig/liblo.pc
61+
sudo apt-get install -yqq g++-arm-linux-gnueabihf libasound2-dev:armhf libcairo2-dev:armhf libdbus-1-dev:armhf libgl1-mesa-dev:armhf liblo-dev:armhf libpulse-dev:armhf libx11-dev:armhf libxcursor-dev:armhf libxext-dev:armhf libxrandr-dev:armhf qemu-user-static
7262
- name: Build linux armhf cross-compiled
7363
env:
7464
CC: arm-linux-gnueabihf-gcc
@@ -87,7 +77,7 @@ jobs:
8777
bin/*
8878
8979
linux-x86:
90-
runs-on: ubuntu-18.04
80+
runs-on: ubuntu-20.04
9181
steps:
9282
- uses: actions/checkout@v2
9383
with:
@@ -96,7 +86,7 @@ jobs:
9686
run: |
9787
sudo dpkg --add-architecture i386
9888
sudo apt-get update -qq
99-
sudo apt-get install -yq g++-multilib libasound2-dev:i386 libcairo2-dev:i386 libgl1-mesa-dev:i386 liblo-dev:i386 libpulse-dev:i386 libx11-dev:i386 libxcursor-dev:i386 libxext-dev:i386 libxrandr-dev:i386
89+
sudo apt-get install -yqq g++-multilib libasound2-dev:i386 libcairo2-dev:i386 libdbus-1-dev:i386 libgl1-mesa-dev:i386 liblo-dev:i386 libpulse-dev:i386 libx11-dev:i386 libxcursor-dev:i386 libxext-dev:i386 libxrandr-dev:i386
10090
- name: Build linux x86
10191
env:
10292
CFLAGS: -m32
@@ -116,15 +106,15 @@ jobs:
116106
bin/*
117107
118108
linux-x86_64:
119-
runs-on: ubuntu-18.04
109+
runs-on: ubuntu-20.04
120110
steps:
121111
- uses: actions/checkout@v2
122112
with:
123113
submodules: recursive
124114
- name: Set up dependencies
125115
run: |
126116
sudo apt-get update -qq
127-
sudo apt-get install -yq libasound2-dev libcairo2-dev libgl1-mesa-dev liblo-dev libpulse-dev libx11-dev libxcursor-dev libxext-dev libxrandr-dev
117+
sudo apt-get install -yqq libasound2-dev libcairo2-dev libdbus-1-dev libgl1-mesa-dev liblo-dev libpulse-dev libx11-dev libxcursor-dev libxext-dev libxrandr-dev
128118
- name: Build linux x86_64
129119
env:
130120
LDFLAGS: -static-libgcc -static-libstdc++
@@ -189,14 +179,14 @@ jobs:
189179
run: |
190180
sudo dpkg --add-architecture i386
191181
sudo apt-get update -qq
192-
sudo apt-get install -yq binutils-mingw-w64-i686 g++-mingw-w64-i686 mingw-w64 wine-stable:i386
182+
sudo apt-get install -yqq binutils-mingw-w64-i686 g++-mingw-w64-i686 mingw-w64 wine-stable:i386
193183
- name: Build win32 cross-compiled
194184
env:
195185
CC: i686-w64-mingw32-gcc
196186
CXX: i686-w64-mingw32-g++
197187
EXE_WRAPPER: wine
198188
PKG_CONFIG: "false"
199-
#WINEDEBUG: "-all"
189+
WINEDEBUG: "-all"
200190
run: |
201191
make features
202192
make -j $(nproc)
@@ -220,14 +210,14 @@ jobs:
220210
- name: Set up dependencies
221211
run: |
222212
sudo apt-get update -qq
223-
sudo apt-get install -yq binutils-mingw-w64-x86-64 g++-mingw-w64-x86-64 mingw-w64 wine-stable
213+
sudo apt-get install -yqq binutils-mingw-w64-x86-64 g++-mingw-w64-x86-64 mingw-w64 wine-stable
224214
- name: Build win64 cross-compiled
225215
env:
226216
CC: x86_64-w64-mingw32-gcc
227217
CXX: x86_64-w64-mingw32-g++
228218
EXE_WRAPPER: wine
229219
PKG_CONFIG: "false"
230-
#WINEDEBUG: "-all"
220+
WINEDEBUG: "-all"
231221
run: |
232222
make features
233223
make -j $(nproc)
@@ -255,9 +245,9 @@ jobs:
255245
sudo dpkg -i kxstudio-repos_10.0.3_all.deb
256246
sudo apt-get update -qq
257247
# build-deps
258-
sudo apt-get install -yq libasound2-dev libcairo2-dev libgl1-mesa-dev liblo-dev libpulse-dev libx11-dev libxcursor-dev libxext-dev libxrandr-dev
248+
sudo apt-get install -yqq libasound2-dev libcairo2-dev libdbus-1-dev libgl1-mesa-dev liblo-dev libpulse-dev libx11-dev libxcursor-dev libxext-dev libxrandr-dev
259249
# runtime testing
260-
sudo apt-get install -yq carla-git lilv-utils lv2-dev lv2lint valgrind
250+
sudo apt-get install -yqq carla-git lilv-utils lv2-dev lv2lint valgrind
261251
- name: Build plugins
262252
env:
263253
CFLAGS: -g

0 commit comments

Comments
 (0)