Skip to content

Commit e425c40

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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 6ab3977 commit e425c40

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

ci/install-dependencies.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ fedora-*|almalinux-*)
3535
MESON_DEPS="meson ninja";;
3636
esac
3737
dnf -yq update >/dev/null &&
38-
dnf -yq install shadow-utils sudo make pkg-config gcc findutils diffutils perl python3 gawk gettext zlib-devel expat-devel openssl-devel curl-devel pcre2-devel $MESON_DEPS >/dev/null
38+
dnf -yq install shadow-utils sudo make pkg-config gcc findutils diffutils perl python3 gawk gettext zlib-devel expat-devel openssl-devel curl-devel pcre2-devel $MESON_DEPS cargo >/dev/null
3939
;;
4040
ubuntu-*|i386/ubuntu-*|debian-*)
4141
# Required so that apt doesn't wait for user input on certain packages.
@@ -62,7 +62,7 @@ ubuntu-*|i386/ubuntu-*|debian-*)
6262
make libssl-dev libcurl4-openssl-dev libexpat-dev wget sudo default-jre \
6363
tcl tk gettext zlib1g-dev perl-modules liberror-perl libauthen-sasl-perl \
6464
libemail-valid-perl libio-pty-perl libio-socket-ssl-perl libnet-smtp-ssl-perl libdbd-sqlite3-perl libcgi-pm-perl \
65-
libsecret-1-dev libpcre2-dev meson ninja-build pkg-config \
65+
libsecret-1-dev libpcre2-dev meson ninja-build pkg-config cargo \
6666
${CC_PACKAGE:-${CC:-gcc}} $PYTHON_PACKAGE
6767

6868
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)