X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=.ci%2Fdeps.sh;h=17b49bbc523bd5f7a78f67de4a32a2bab79c9b59;hb=38a4eb4ebc730d805fcab9d64fe988be42a99122;hp=1c8293a71685fa0128146c4ecac867e9896aedc8;hpb=41c83ed14fa28a723d666ff8dc8971d67abee276;p=tinc

diff --git a/.ci/deps.sh b/.ci/deps.sh
index 1c8293a7..17b49bbc 100755
--- a/.ci/deps.sh
+++ b/.ci/deps.sh
@@ -2,12 +2,19 @@
 
 set -eu
 
+SKIP_OPENSSL3="${SKIP_OPENSSL3:-}"
+SKIP_MESON="${SKIP_MESON:-}"
+
 deps_linux_alpine() {
   apk upgrade
 
   apk add \
-    git binutils meson pkgconf gcc linux-headers shadow sudo libgcrypt-dev texinfo gzip \
+    git binutils ninja pkgconf gcc linux-headers shadow sudo libgcrypt-dev texinfo gzip \
     openssl-dev zlib-dev lzo-dev ncurses-dev readline-dev musl-dev lz4-dev vde2-dev cmocka-dev
+
+  if [ -z "$SKIP_MESON" ]; then
+    apk add meson
+  fi
 }
 
 deps_linux_debian_mingw() {
@@ -37,6 +44,7 @@ deps_linux_debian_linux() {
     libminiupnpc-dev:"$HOST" \
     libvdeplug-dev:"$HOST" \
     libcmocka-dev:"$HOST" \
+    libsystemd-dev:"$HOST" \
     "$@"
 
   if [ -n "$HOST" ]; then
@@ -51,7 +59,7 @@ deps_linux_debian() {
 
   apt-get update
   apt-get upgrade -y
-  apt-get install -y git pkgconf sudo texinfo
+  apt-get install -y git pkgconf sudo texinfo ninja-build
 
   HOST=${HOST:-}
   if [ "$HOST" = mingw ]; then
@@ -60,6 +68,10 @@ deps_linux_debian() {
     deps_linux_debian_linux "$@"
   fi
 
+  if [ -n "$SKIP_MESON" ]; then
+    return
+  fi
+
   . /etc/os-release
 
   # Debian Buster ships an old version of meson (0.49).
@@ -87,8 +99,12 @@ deps_linux_rhel() {
   fi
 
   yum install -y \
-    git binutils make meson pkgconf gcc sudo texinfo-tex systemd perl-IPC-Cmd \
-    lzo-devel zlib-devel lz4-devel ncurses-devel readline-devel libgcrypt-devel "$@"
+    git binutils make ninja-build pkgconf gcc sudo texinfo-tex systemd perl-IPC-Cmd \
+    lzo-devel zlib-devel lz4-devel ncurses-devel readline-devel libgcrypt-devel systemd-devel "$@"
+
+  if [ -z "$SKIP_MESON" ]; then
+    yum install -y meson
+  fi
 
   if yum info openssl11-devel; then
     yum install -y openssl11-devel
@@ -102,7 +118,7 @@ deps_linux_rhel() {
 }
 
 linux_openssl3() {
-  if [ -n "${SKIP_OPENSSL3:-}" ]; then
+  if [ -n "$SKIP_OPENSSL3" ]; then
     echo >&2 "skipping openssl3 installation in this job"
     return
   fi
@@ -158,7 +174,11 @@ deps_linux() {
 }
 
 deps_macos() {
-  brew install lzo lz4 miniupnpc libgcrypt openssl meson "$@"
+  brew install lzo lz4 miniupnpc libgcrypt openssl "$@"
+
+  if [ -z "$SKIP_MESON" ]; then
+    brew install meson
+  fi
 }
 
 case "$(uname -s)" in