Skip to content

Commit 87c26bb

Browse files
committed
staging: add meson and musl-dev
The meson staging build depends on meson and additianly on musl-dev for the alpine container. Signed-off-by: Daniel Wagner <[email protected]>
1 parent dcdbed2 commit 87c26bb

5 files changed

Lines changed: 10 additions & 0 deletions

File tree

ci-containers.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ bundles:
117117
- make
118118
- git
119119
- gcc
120+
- meson
120121
- libpkgconf-dev
121122
- libcurl4-openssl-dev
122123
- libarchive-dev
@@ -128,6 +129,7 @@ bundles:
128129
- ca-certificates
129130
- cmake
130131
- make
132+
- meson
131133
- git
132134
- gcc
133135
- pkgconf-pkg-config
@@ -141,6 +143,7 @@ bundles:
141143
- ca-certificates
142144
- cmake
143145
- make
146+
- meson
144147
- git
145148
- gcc
146149
- pkg-config
@@ -162,6 +165,8 @@ bundles:
162165
- python3
163166
- py3-yaml
164167
- bash
168+
- musl-dev
169+
- meson
165170

166171
muon-dep:
167172
debian:

staging/Dockerfile.alpine

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ RUN apk update && \
2323
python3 \
2424
py3-yaml \
2525
bash \
26+
musl-dev \
27+
meson \
2628
&& apk cache clean && \
2729
rm -rf /var/cache/apk/* /tmp/* /var/tmp/*
2830

staging/Dockerfile.debian

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ RUN apt-get update && \
1919
make \
2020
git \
2121
gcc \
22+
meson \
2223
libpkgconf-dev \
2324
libcurl4-openssl-dev \
2425
libarchive-dev \

staging/Dockerfile.fedora

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ RUN dnf update -y && \
1515
ca-certificates \
1616
cmake \
1717
make \
18+
meson \
1819
git \
1920
gcc \
2021
pkgconf-pkg-config \

staging/Dockerfile.tumbleweed

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ RUN zypper --non-interactive refresh && \
1818
ca-certificates \
1919
cmake \
2020
make \
21+
meson \
2122
git \
2223
gcc \
2324
pkg-config \

0 commit comments

Comments
 (0)