Skip to content

Commit 63a597d

Browse files
pks-tgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 235fe77 commit 63a597d

File tree

4 files changed

+9
-3
lines changed

4 files changed

+9
-3
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ jobs:
265265
run: pip install meson ninja
266266
- name: Setup
267267
shell: pwsh
268-
run: meson setup build -Dperl=disabled
268+
run: meson setup build -Dperl=disabled -Dcredential_helpers=wincred
269269
- name: Compile
270270
shell: pwsh
271271
run: meson compile -C build

.gitlab-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ build:msvc-meson:
164164
extends: .msvc-meson
165165
stage: build
166166
script:
167-
- meson setup build -Dperl=disabled
167+
- meson setup build -Dperl=disabled -Dcredential_helpers=wincred
168168
- meson compile -C build
169169
artifacts:
170170
paths:

ci/install-dependencies.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ ubuntu-*|i386/ubuntu-*|debian-*)
5858
make libssl-dev libcurl4-openssl-dev libexpat-dev wget sudo default-jre \
5959
tcl tk gettext zlib1g-dev perl-modules liberror-perl libauthen-sasl-perl \
6060
libemail-valid-perl libio-pty-perl libio-socket-ssl-perl libnet-smtp-ssl-perl libdbd-sqlite3-perl libcgi-pm-perl \
61-
libpcre2-dev meson ninja-build pkg-config \
61+
libsecret-1-dev libpcre2-dev meson ninja-build pkg-config \
6262
${CC_PACKAGE:-${CC:-gcc}} $PYTHON_PACKAGE
6363

6464
case "$distro" in

ci/lib.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -348,6 +348,9 @@ case "$jobname" in
348348
linux32)
349349
CC=gcc
350350
;;
351+
linux-meson)
352+
MESONFLAGS="$MESONFLAGS -Dcredential_helpers=libsecret,netrc"
353+
;;
351354
linux-musl-meson)
352355
MESONFLAGS="$MESONFLAGS -Dtest_utf8_locale=C.UTF-8"
353356
;;
@@ -359,6 +362,9 @@ linux-asan-ubsan)
359362
export NO_SVN_TESTS=LetsSaveSomeTime
360363
MAKEFLAGS="$MAKEFLAGS NO_PYTHON=YepBecauseP4FlakesTooOften"
361364
;;
365+
osx-meson)
366+
MESONFLAGS="$MESONFLAGS -Dcredential_helpers=osxkeychain"
367+
;;
362368
esac
363369

364370
MAKEFLAGS="$MAKEFLAGS CC=${CC:-cc}"

0 commit comments

Comments
 (0)