Skip to content

Commit 3780a89

Browse files
falkTXfalkTX
committed
Update CI setup
Signed-off-by: falkTX <[email protected]>
1 parent aec4476 commit 3780a89

File tree

2 files changed

+34
-28
lines changed

2 files changed

+34
-28
lines changed

‎.github/workflows/bootstrap-deps.sh

+15-7
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ fi
99

1010
function get_linux_deb_arch() {
1111
case "${1}" in
12-
"linux-aarch64") echo "arm64" ;;
12+
"linux-arm64"|"linux-aarch64") echo "arm64" ;;
1313
"linux-armhf") echo "armhf" ;;
14-
"linux-i686") echo "i386" ;;
14+
"linux-i386"|"linux-i686") echo "i386" ;;
1515
"linux-riscv64") echo "riscv64" ;;
1616
"linux-x86_64") echo "amd64" ;;
1717
esac
@@ -72,8 +72,9 @@ function install_compiler() {
7272
}
7373

7474
case "${1}" in
75-
"macos"|"macos-universal"|"macos-universal-10.15")
76-
brew install autoconf automake cmake coreutils gawk git gnu-sed jq make meson
75+
"macos"|"macos-intel"|"macos-10.15"|"macos-universal"|"macos-universal-10.15")
76+
brew install autoconf automake cmake coreutils gawk git gnu-sed jq libtool make meson
77+
brew uninstall --ignore-dependencies cairo freetype
7778

7879
[ -n "${GITHUB_ENV}" ] && echo "PAWPAW_PACK_NAME=${1}-$(sw_vers -productVersion | cut -d '.' -f 1)" >> "${GITHUB_ENV}"
7980
;;
@@ -90,8 +91,12 @@ case "${1}" in
9091

9192
if [ -n "${linux_arch}" ]; then
9293
if [ "$(lsb_release -si 2>/dev/null)" = "Ubuntu" ]; then
93-
sed -i "s/deb http/deb [arch=i386,amd64] http/" /etc/apt/sources.list
94-
sed -i "s/deb mirror/deb [arch=i386,amd64] mirror/" /etc/apt/sources.list
94+
if [ -e /etc/apt/sources.list.d/ubuntu.sources ]; then
95+
sed -i 's|Types: deb|Types: deb\nArchitectures: amd64 i386|g' /etc/apt/sources.list.d/ubuntu.sources
96+
else
97+
sed -i "s/deb http/deb [arch=i386,amd64] http/" /etc/apt/sources.list
98+
sed -i "s/deb mirror/deb [arch=i386,amd64] mirror/" /etc/apt/sources.list
99+
fi
95100
if [ "${linux_arch}" != "amd64" ] && [ "${linux_arch}" != "i386" ]; then
96101
echo "deb [arch=${linux_arch}] http://ports.ubuntu.com/ubuntu-ports ${release} main restricted universe multiverse" | tee -a /etc/apt/sources.list
97102
echo "deb [arch=${linux_arch}] http://ports.ubuntu.com/ubuntu-ports ${release}-updates main restricted universe multiverse" | tee -a /etc/apt/sources.list
@@ -107,7 +112,7 @@ case "${1}" in
107112
apt-get install -yqq --allow-downgrades \
108113
binfmt-support \
109114
qemu-user-static \
110-
x11proto-dev x11proto-render-dev \
115+
x11proto-dev x11proto-render-dev x11proto-xf86vidmode-dev \
111116
libasound2-dev:${linux_arch} \
112117
libdbus-1-dev:${linux_arch} \
113118
libfftw3-dev:${linux_arch} \
@@ -119,11 +124,14 @@ case "${1}" in
119124
libvulkan-dev:${linux_arch} \
120125
libx11-dev:${linux_arch} \
121126
libxcb1-dev:${linux_arch} \
127+
libxcb-dri2-0-dev:${linux_arch} \
122128
libxcursor-dev:${linux_arch} \
129+
libxdamage-dev:${linux_arch} \
123130
libxext-dev:${linux_arch} \
124131
libxfixes-dev:${linux_arch} \
125132
libxrandr-dev:${linux_arch} \
126133
libxrender-dev:${linux_arch} \
134+
libxxf86vm-dev:${linux_arch} \
127135
uuid-dev:${linux_arch}
128136
apt-get install -yqq --allow-downgrades \
129137
qtbase5-dev-tools \

‎.github/workflows/build.yml

+19-21
Original file line numberDiff line numberDiff line change
@@ -13,39 +13,36 @@ jobs:
1313
strategy:
1414
matrix:
1515
include:
16-
- target: linux-aarch64
17-
pkgprefix: aarch64-linux-gnu
18-
container: ubuntu:18.04
1916
- target: linux-aarch64
2017
pkgprefix: aarch64-linux-gnu
2118
container: ubuntu:20.04
2219
- target: linux-aarch64
2320
pkgprefix: aarch64-linux-gnu
2421
container: ubuntu:22.04
25-
- target: linux-armhf
26-
pkgprefix: arm-linux-gnueabihf
27-
container: ubuntu:18.04
22+
- target: linux-aarch64
23+
pkgprefix: aarch64-linux-gnu
24+
container: ubuntu:24.04
2825
- target: linux-armhf
2926
pkgprefix: arm-linux-gnueabihf
3027
container: ubuntu:20.04
3128
- target: linux-armhf
3229
pkgprefix: arm-linux-gnueabihf
3330
container: ubuntu:22.04
34-
- target: linux-i686
35-
pkgprefix: i386-linux-gnu
36-
container: ubuntu:18.04
31+
- target: linux-armhf
32+
pkgprefix: arm-linux-gnueabihf
33+
container: ubuntu:24.04
3734
- target: linux-i686
3835
pkgprefix: i386-linux-gnu
3936
container: ubuntu:20.04
40-
- target: linux-x86_64
41-
pkgprefix: x86_64-linux-gnu
42-
container: ubuntu:18.04
4337
- target: linux-x86_64
4438
pkgprefix: x86_64-linux-gnu
4539
container: ubuntu:20.04
4640
- target: linux-x86_64
4741
pkgprefix: x86_64-linux-gnu
4842
container: ubuntu:22.04
43+
- target: linux-x86_64
44+
pkgprefix: x86_64-linux-gnu
45+
container: ubuntu:24.04
4946
runs-on: ubuntu-latest
5047
container:
5148
image: ${{ matrix.container }}
@@ -69,7 +66,7 @@ jobs:
6966
rm *.deb
7067
;;
7168
esac
72-
- uses: actions/checkout@v3
69+
- uses: actions/checkout@v4
7370
with:
7471
submodules: recursive
7572
- name: Set up dependencies
@@ -96,7 +93,7 @@ jobs:
9693
- name: Pack binaries
9794
run: |
9895
tar czf ${{ github.event.repository.name }}-${{ env.PAWPAW_PACK_NAME }}-${{ github.event.pull_request.number || env.SHA8 }}.tar.gz -C ${{ env.DESTDIR }}/usr/lib lv2 vst vst3
99-
- uses: actions/upload-artifact@v3
96+
- uses: actions/upload-artifact@v4
10097
with:
10198
name: ${{ github.event.repository.name }}-${{ env.PAWPAW_PACK_NAME }}-${{ github.event.pull_request.number || env.SHA8 }}
10299
path: |
@@ -123,7 +120,7 @@ jobs:
123120
curl -sLO https://launchpad.net/~kxstudio-debian/+archive/ubuntu/toolchain/+files/git-man_2.34.1-1ubuntu1~bpo20.04.1~ppa1_all.deb
124121
dpkg -i *.deb
125122
rm *.deb
126-
- uses: actions/checkout@v3
123+
- uses: actions/checkout@v4
127124
with:
128125
submodules: recursive
129126
- name: Set up dependencies
@@ -139,11 +136,12 @@ jobs:
139136
strategy:
140137
matrix:
141138
include:
142-
- os: macos-11
143-
- os: macos-12
139+
- os: macos-13
140+
- os: macos-14
141+
- os: macos-15
144142
runs-on: ${{ matrix.os }}
145143
steps:
146-
- uses: actions/checkout@v3
144+
- uses: actions/checkout@v4
147145
with:
148146
submodules: recursive
149147
- name: Set up dependencies
@@ -167,7 +165,7 @@ jobs:
167165
- name: Pack binaries
168166
run: |
169167
tar czf ${{ github.event.repository.name }}-${{ env.PAWPAW_PACK_NAME }}-${{ github.event.pull_request.number || env.SHA8 }}.tar.gz -C ${{ env.DESTDIR }}/usr/lib lv2 vst vst3
170-
- uses: actions/upload-artifact@v3
168+
- uses: actions/upload-artifact@v4
171169
with:
172170
name: ${{ github.event.repository.name }}-${{ env.PAWPAW_PACK_NAME }}-${{ github.event.pull_request.number || env.SHA8 }}
173171
path: |
@@ -195,7 +193,7 @@ jobs:
195193
- name: Install git
196194
run: |
197195
apt-get update -qq && apt-get install -yqq --no-install-recommends ca-certificates git
198-
- uses: actions/checkout@v3
196+
- uses: actions/checkout@v4
199197
with:
200198
submodules: recursive
201199
- name: Set up dependencies
@@ -227,7 +225,7 @@ jobs:
227225
- name: Pack binaries
228226
run: |
229227
tar czf ${{ github.event.repository.name }}-${{ matrix.target }}-${{ github.event.pull_request.number || env.SHA8 }}.tar.gz -C ${{ env.DESTDIR }}/usr/lib lv2 vst vst3
230-
- uses: actions/upload-artifact@v3
228+
- uses: actions/upload-artifact@v4
231229
with:
232230
name: ${{ github.event.repository.name }}-${{ matrix.target }}-${{ github.event.pull_request.number || env.SHA8 }}
233231
path: |

0 commit comments

Comments
 (0)