Skip to content

Commit 8c4dafb

Browse files
pks-tgitster
authored andcommitted
ci: enable Rust for breaking-changes jobs
Enable Rust for our breaking-changes jobs so that we can verify that the build infrastructure and the converted Rust subsystems work as expected. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 4fe7461 commit 8c4dafb

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

ci/install-dependencies.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ alpine-*)
3131
;;
3232
fedora-*|almalinux-*)
3333
dnf -yq update >/dev/null &&
34-
dnf -yq install shadow-utils sudo meson ninja pkg-config gcc findutils diffutils perl python3 gawk gettext zlib-devel expat-devel openssl-devel curl-devel pcre2-devel >/dev/null
34+
dnf -yq install shadow-utils sudo meson ninja pkg-config gcc findutils diffutils perl python3 gawk gettext zlib-devel expat-devel openssl-devel curl-devel pcre2-devel rustc >/dev/null
3535
;;
3636
ubuntu-*|i386/ubuntu-*|debian-*)
3737
# Required so that apt doesn't wait for user input on certain packages.
@@ -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-
libsecret-1-dev libpcre2-dev meson ninja-build pkg-config \
61+
libsecret-1-dev libpcre2-dev meson ninja-build pkg-config cargo \
6262
${CC_PACKAGE:-${CC:-gcc}} $PYTHON_PACKAGE
6363

6464
case "$distro" in

ci/run-build-and-tests.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ case "$jobname" in
99
fedora-breaking-changes-musl|linux-breaking-changes)
1010
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
1111
export WITH_BREAKING_CHANGES=YesPlease
12+
export WITH_RUST=YesPlease
1213
MESONFLAGS="$MESONFLAGS -Dbreaking_changes=true"
14+
MESONFLAGS="$MESONFLAGS -Drust=enabled"
1315
;;
1416
linux-TEST-vars)
1517
export OPENSSL_SHA1_UNSAFE=YesPlease

0 commit comments

Comments
 (0)