From edddf07019a5c7362907d586f9ea081a4b3144ee Mon Sep 17 00:00:00 2001
From: Lars Wirzenius <liw@liw.fi>
Date: Sun, 21 Mar 2021 18:52:13 +0200
Subject: fix rust project pipelines to build releases

---
 ci-prod.ick | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/ci-prod.ick b/ci-prod.ick
index 5bec876..aa934de 100644
--- a/ci-prod.ick
+++ b/ci-prod.ick
@@ -320,9 +320,11 @@ projects:
       - ick/add_apt_signing_keys
       - ick/add_apt_sources
       - ick/restore_workspace
+      - remove_debs_from_workspace
       - ick/get_sources
       - ick/install_debian_build_dependencies
       - ick/build_deb_ci
+      - build_deb_releases
       - ick/upload_debs
       - ick/save_workspace
 
@@ -332,11 +334,13 @@ projects:
       - ick/add_apt_signing_keys
       - ick/add_apt_sources
       - ick/restore_workspace
+      - remove_debs_from_workspace
       - ick/get_sources
       - rustup
       - ick/install_debian_build_dependencies
       - rust_run_check_if_there
       - build_deb_ci_with_rustup_rust
+      - build_deb_releases
       - ick/upload_debs
       - format_subplots
       - ick/save_workspace
@@ -347,10 +351,12 @@ projects:
       - ick/add_apt_signing_keys
       - ick/add_apt_sources
       - ick/restore_workspace
+      - remove_debs_from_workspace
       - ick/get_sources
       - rustup
       - ick/install_debian_build_dependencies
       - build_deb_ci_with_rustup_rust
+      - build_deb_releases
       - ick/upload_debs
       - format_subplots
       - ick/save_workspace
@@ -774,18 +780,7 @@ projects:
       rsync_target: ickliwfi@http.liw.fi:/srv/http/trash
       workspace_name: heippa
       distribution_rel: unstable
-    pipelines:
-      - ick/setup_container
-      - ick/add_apt_signing_keys
-      - ick/add_apt_sources
-      - ick/restore_workspace
-      - remove_debs_from_workspace
-      - ick/get_sources
-      - ick/install_debian_build_dependencies
-      - ick/build_deb_ci
-      - build_deb_releases
-      - ick/upload_debs
-      - ick/save_workspace
+    pipelines: *deb_ci_pipelines
 
 
 
@@ -1011,6 +1006,12 @@ pipelines:
           export HOME=/workspace
           export PATH="$HOME/.cargo/bin:$PATH"
           
+          if [ ! -e ick-helpers ]
+          then
+              rm -rf ick-helpers
+              git clone git://git.liw.fi/ick-helpers
+          fi
+
           cd /workspace/src
 
           # Build new releases.
@@ -1029,13 +1030,13 @@ pipelines:
             cat /workspace/built_tags
           fi
 
-          python3 ./list_new_release_tags /workspace/built_tags > /workspace/new_tags
+          /workspace/ick-helpers/list_new_release_tags /workspace/built_tags > /workspace/new_tags
           cat /workspace/new_tags
 
           cat /workspace/new_tags | while read tag
           do
             echo "New release tag: $tag"
-            bash -x ./build_release_deb.sh /workspace "$tag"
+            /workspace/ick-helpers//build_release_deb.sh /workspace "$tag"
             echo "Finished building tag $tag"
           done
 
-- 
cgit v1.2.1