Add rust dependencies

joseivanlopez · Dec 4, 2023 · 100148e · 100148e
1 parent f8c5da8
commit 100148e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/.github/workflows/ci-rust.yml b/.github/workflows/ci-rust.yml
@@ -68,7 +68,7 @@ jobs:
       run: zypper --non-interactive install rustup
 
     - name: Install required packages
-      run: zypper --non-interactive install  python-langtable-data openssl-3 libopenssl-3-devel jq
+      run: zypper --non-interactive install python-langtable-data openssl-3 libopenssl-3-devel jq
 
     - name: Install Rust toolchains
       run: rustup toolchain install stable

diff --git a/setup-service.sh b/setup-service.sh
@@ -88,8 +88,7 @@ snapper \
 udftools \
 xfsprogs || exit 1
 
-# - Install service rubygem dependencies
-# Install s390 pakcages (do not exit on failure).
+# Install s390 packages (do not exit on failure).
 $SUDO zypper --non-interactive --gpg-auto-import-keys install \
 yast2-s390 \
 yast2-reipl \
@@ -102,15 +101,24 @@ yast2-cio
   bundle install
 )
 
-# Rust service
+# Rust service, CLI and auto-installation.
+
+# Only install cargo if it is not available (avoid conflicts with rustup)
+which cargo || $SUDO zypper --non-interactive install cargo
 
 # This repo can be removed once python-language-data reaches Factory.
 test -f /etc/zypp/repos.d/d_l_python.repo || \
   $SUDO zypper --non-interactive \
     addrepo https://download.opensuse.org/repositories/devel:/languages:/python/openSUSE_Tumbleweed/ d_l_python
 
-# Only install cargo if it is not available (avoid conflicts with rustup)
-which cargo || $SUDO zypper --non-interactive install cargo
+# Packages required by Rust code (see ./rust/package/agama-cli.spec)
+$SUDO zypper --non-interactive install \
+bzip2 \
+jsonnet \
+lshw \
+python-langtable-data \
+tar \
+xkeyboard-config-lang || exit 1
 
 (
   cd $MYDIR/rust