From a406790abfa34e80ecdb2c5e236db7e24cb7eb28 Mon Sep 17 00:00:00 2001
From: finn <finn@janky.solutions>
Date: Mon, 19 Dec 2022 23:28:43 -0800
Subject: [PATCH] tweak cargo build invocation

---
 .gitlab-ci.yml | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 61f9ff7..c36a907 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,6 +5,7 @@ stages:
 variables:
   libsignal_version: "v0.21.1"
   GRADLE_OPTS: -Dorg.gradle.daemon=false
+  CARGO_TERM_COLOR: always
 
 .multitarget:
   parallel:
@@ -40,24 +41,9 @@ compile:
     - cd libsignal-client && git checkout "$libsignal_version"
     - rustup target add "${TARGET}"
     - if [[ -d ../target ]]; then mv ../target target; fi
-    - RUSTFLAGS="$(../rustflags.sh)" cargo build -p libsignal-jni --target "${TARGET}" --release --verbose
+    - RUSTFLAGS="$(../rustflags.sh)" cargo build +stable --target "${TARGET}" --workspace --verbose
     - cp -v target/${TARGET}/release/libsignal_jni.so ../libsignal_jni-${TARGET}.so
     - cp target/ ../target
-  # variables:
-  #   CC: clang-13
-  #   CXX: clang++-13
-  #   CPP: clang-cpp-13
-  #   AR: llvm-ar-13
-  #   STRIP: llvm-strip-13
-  #   RANLIB: llvm-ranlib-13
-  #   AS: llvm-as-13
-  #   OBJDUMP: llvm-objdump-13
-  #   OBJCOPY: llvm-objcopy-13
-  #   READELF: llvm-readelf-13
-  #   NM: llvm-nm-13
-  #   CC_LD: lld-13
-  #   CXX_LD: lld-13
-  #   LD: lld-13
   cache:
     paths:
       - target/