Wire up credential helpers in our CI runs so that we can rest assured
that they compile and (if tests are available) function correctly.
Signed-off-by: Patrick Steinhardt <ps@xxxxxx>
---
.github/workflows/main.yml | 2 +-
.gitlab-ci.yml | 2 +-
ci/install-dependencies.sh | 2 +-
ci/lib.sh | 6 ++++++
4 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 5f756dfc2e2..9959b61ece2 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -265,7 +265,7 @@ jobs:
run: pip install meson ninja
- name: Setup
shell: pwsh
- run: meson setup build -Dperl=disabled
+ run: meson setup build -Dperl=disabled -Dcredential_helpers=wincred
- name: Compile
shell: pwsh
run: meson compile -C build
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3f29181708f..bb7d0c9ef1c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -164,7 +164,7 @@ build:msvc-meson:
extends: .msvc-meson
stage: build
script:
- - meson setup build -Dperl=disabled
+ - meson setup build -Dperl=disabled -Dcredential_helpers=wincred
- meson compile -C build
artifacts:
paths:
diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh
index 332ba960039..0df74610d06 100755
--- a/ci/install-dependencies.sh
+++ b/ci/install-dependencies.sh
@@ -58,7 +58,7 @@ ubuntu-*|i386/ubuntu-*|debian-*)
make libssl-dev libcurl4-openssl-dev libexpat-dev wget sudo default-jre \
tcl tk gettext zlib1g-dev perl-modules liberror-perl libauthen-sasl-perl \
libemail-valid-perl libio-pty-perl libio-socket-ssl-perl libnet-smtp-ssl-perl libdbd-sqlite3-perl libcgi-pm-perl \
- libpcre2-dev meson ninja-build pkg-config \
+ libsecret-1-dev libpcre2-dev meson ninja-build pkg-config \
${CC_PACKAGE:-${CC:-gcc}} $PYTHON_PACKAGE
case "$distro" in
diff --git a/ci/lib.sh b/ci/lib.sh
index 84d11452650..f561884d401 100755
--- a/ci/lib.sh
+++ b/ci/lib.sh
@@ -348,6 +348,9 @@ case "$jobname" in
linux32)
CC=gcc
;;
+linux-meson)
+ MESONFLAGS="$MESONFLAGS -Dcredential_helpers=libsecret,netrc"
+ ;;
linux-musl-meson)
MESONFLAGS="$MESONFLAGS -Dtest_utf8_locale=C.UTF-8"
;;
@@ -359,6 +362,9 @@ linux-asan-ubsan)
export NO_SVN_TESTS=LetsSaveSomeTime
MAKEFLAGS="$MAKEFLAGS NO_PYTHON=YepBecauseP4FlakesTooOften"
;;
+osx-meson)
+ MESONFLAGS="$MESONFLAGS -Dcredential_helpers=osxkeychain"
+ ;;
esac
MAKEFLAGS="$MAKEFLAGS CC=${CC:-cc}"
--
2.48.1.666.gff9fcf71b7.dirty
