Skip to content

Commit 41d9d66

Browse files
evelikovlucasdemarchi
authored andcommitted
ci: enable mbedtls by default for most instances
As the mbedtls introduction commit says, mbedtls v3 is not available in Debian 12 and Ubuntu 22.04/24.04. Although to ensure we have sufficient build coverage, let's enable it everywhere else. While also adding a permutation where it's the only crypto implementation built-in. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Link: #426 Signed-off-by: Lucas De Marchi <demarchi@kernel.org>
1 parent c3765cd commit 41d9d66

9 files changed

Lines changed: 31 additions & 10 deletions

File tree

.github/actions/setup-os/setup-alpine.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ apk add \
1313
git \
1414
gtk-doc \
1515
linux-stable-dev \
16+
mbedtls-dev \
1617
meson \
1718
openssl-dev \
1819
scdoc \

.github/actions/setup-os/setup-arch.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,6 @@ pacman --noconfirm -Su \
1818
gtk-doc \
1919
linux-headers \
2020
lld \
21+
mbedtls \
2122
meson \
2223
scdoc

.github/actions/setup-os/setup-debian.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,14 @@
66

77
export DEBIAN_FRONTEND=noninteractive
88
export TZ=Etc/UTC
9+
10+
. /etc/os-release
11+
12+
mbedtls_pkgs=()
13+
if [[ "$VERSION_CODENAME" != "bookworm" ]]; then
14+
mbedtls_pkgs=("libmbedtls-dev")
15+
fi
16+
917
apt-get update
1018
apt-get install --yes \
1119
bash \
@@ -19,6 +27,7 @@ apt-get install --yes \
1927
libzstd-dev \
2028
linux-headers-generic \
2129
meson \
30+
"${mbedtls_pkgs[@]}" \
2231
scdoc \
2332
zlib1g-dev \
2433
zstd

.github/actions/setup-os/setup-fedora.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ dnf install -y \
1919
libubsan \
2020
libzstd-devel \
2121
make \
22+
mbedtls-devel \
2223
meson \
2324
openssl-devel \
2425
scdoc \

.github/workflows/codeql.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
matrix:
3333
include:
3434
- container: 'ubuntu:24.04'
35-
meson_setup: '-D b_sanitize=none -D build-tests=false'
35+
meson_setup: '-D b_sanitize=none -D build-tests=false -Dmbedtls=disabled'
3636

3737
container:
3838
image: ${{ matrix.container }}

.github/workflows/coverage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
matrix:
3030
include:
3131
- container: 'ubuntu:24.04'
32-
meson_setup: '-D b_sanitize=none -D b_coverage=true'
32+
meson_setup: '-D b_sanitize=none -D b_coverage=true -Dmbedtls=disabled'
3333

3434
container:
3535
image: ${{ matrix.container }}

.github/workflows/main.yml

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,15 @@ jobs:
3535
only_bits: '64'
3636
- container: 'archlinux:multilib-devel'
3737
- container: 'debian:bookworm-slim'
38-
meson_setup: '-Dzstd=disabled -Dxz=disabled -Dzlib=disabled'
38+
meson_setup: '-Dzstd=disabled -Dxz=disabled -Dzlib=disabled -Dmbedtls=disabled'
3939
only_compiler: 'gcc'
4040
- container: 'debian:unstable'
4141
- container: 'fedora:latest'
4242
only_bits: '64'
4343
- container: 'ubuntu:22.04'
44+
meson_setup: '-Dmbedtls=disabled'
4445
- container: 'ubuntu:24.04'
46+
meson_setup: '-Dmbedtls=disabled'
4547

4648
# Special configurations
4749

@@ -51,7 +53,7 @@ jobs:
5153
only_bits: '64'
5254
custom: 'no-xz-dlopen-all'
5355
- container: 'ubuntu:22.04'
54-
meson_setup: '-Ddlopen=zstd,zlib'
56+
meson_setup: '-Ddlopen=zstd,zlib -Dmbedtls=disabled'
5557
only_bits: '64'
5658
custom: 'dlopen-zstd-zlib'
5759

@@ -74,6 +76,13 @@ jobs:
7476
only_compiler: 'gcc'
7577
custom: 'custom-moduledir'
7678

79+
# Variant without openssl - only mbedtls
80+
- container: 'archlinux:multilib-devel'
81+
meson_setup: '-Dopenssl=disabled'
82+
only_bits: '64'
83+
only_compiler: 'gcc'
84+
custom: 'mbedtls-only'
85+
7786
container:
7887
image: ${{ matrix.container }}
7988

@@ -116,8 +125,8 @@ jobs:
116125
should_fail -D dlopen=nonexistent
117126
should_fail -D xz=disabled -D dlopen=xz
118127
119-
should_pass -D dlopen=xz
120-
should_pass -D dlopen=xz -D xz=enabled
128+
should_pass -D mbedtls=disabled -D dlopen=xz
129+
should_pass -D mbedtls=disabled -D dlopen=xz -D xz=enabled
121130
122131
- name: configure
123132
run: |
@@ -126,7 +135,7 @@ jobs:
126135
127136
if [[ "$2" == "32" ]]; then
128137
echo "::notice::TODO fix and reuse the original options."
129-
setup_options="$setup_options -Dzstd=disabled -Dxz=disabled -Dzlib=disabled -Dopenssl=disabled"
138+
setup_options="$setup_options -Dzstd=disabled -Dxz=disabled -Dzlib=disabled -Dopenssl=disabled -Dmbedtls=disabled"
130139
131140
echo "::notice::TODO fix and re-enable sanitizer(s)."
132141
setup_options="$setup_options -Db_sanitize=none"

build-dev.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ zstd = 'enabled'
1111
xz = 'enabled'
1212
zlib = 'enabled'
1313
openssl = 'enabled'
14-
mbedtls = 'disabled'
14+
mbedtls = 'enabled'
1515
werror = true
1616
b_sanitize = 'address,undefined'
1717

meson_options.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ option(
6363
option(
6464
'mbedtls',
6565
type : 'feature',
66-
value : 'disabled',
67-
description : 'MbedTLS support, PKCS7 signatures. Default: disabled',
66+
value : 'enabled',
67+
description : 'MbedTLS support, PKCS7 signatures. Default: enabled',
6868
)
6969

7070
option(

0 commit comments

Comments
 (0)