ci: exercise credential helpers

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@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 5f756dfc2e20844e04bf2fec96b9df429ec0264a..9959b61ece2bcc63ce70fc7c0b6f2089adba661f 100644 (file)
--- 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 3f29181708f761bd161a032029c5c005465f6f52..bb7d0c9ef1c363ab7f1d858e51a56a3d19a01aa2 100644 (file)
--- 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 332ba960039157494bc58ad2593f15a878657df2..0df74610d063fb8793ea1774f030b84dc1338979 100755 (executable)
--- 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 84d1145265081d233f21b895fbf3f04192f6c424..f561884d40166cc6bdde07e178170ba33aac1347 100755 (executable)
--- 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}"