From e7c3154767e0c7bbd3e78ce8517214ddae2e9f95 Mon Sep 17 00:00:00 2001
From: Lars Wirzenius <liw@liw.fi>
Date: Thu, 11 Mar 2021 08:57:09 +0200
Subject: fix: vmadm release deb builds

---
 ci-prod-programs.ick | 80 ++++++++++++++++++++++++++++++++++------------------
 1 file changed, 52 insertions(+), 28 deletions(-)

diff --git a/ci-prod-programs.ick b/ci-prod-programs.ick
index 915c980..0866e1c 100644
--- a/ci-prod-programs.ick
+++ b/ci-prod-programs.ick
@@ -652,9 +652,18 @@ projects:
     - ick/setup_container
     - ick/add_apt_signing_keys
     - ick/add_apt_sources
+    - ick/restore_workspace
+    - list_workspace
+
     - ick/get_sources
+    - list_workspace
+
     - ick/install_debian_build_dependencies
+    - list_workspace
+
     - rustup
+    - list_workspace
+
     - build_rust_project_as_deb
     - ick/upload_debs
     - docgen_and_publish_subplots
@@ -987,20 +996,40 @@ pipelines:
  
 - pipeline: build_rust_project_as_deb
   actions:
+    # - where: container
+    #   shell: |
+    #     export HOME=/workspace
+    #     export PATH="$HOME/.cargo/bin:$PATH"
+    #     export TMPDIR=/workspace
+
+    #     cd /workspace/src
+
+    #     echo looking for new releases to build
+
+    #     [ -e /workspace/built_tags ] && cat /workspace/built_tags
+    #     git tag -l
+    #     python3 ./list_new_release_tags /workspace/built_tags > /workspace/new_tags
+    #     [ -e /workspace/built_tags ] && cat /workspace/built_tags
+    #     cat /workspace/new_tags
+
+    #     cat /workspace/new_tags | while read tag
+    #     do
+    #       echo ----------------------------------------
+    #       echo "New release tag: $tag"
+    #       # bash ./build_release_deb.sh /workspace "$tag"
+    #       echo "Finished building tag $tag"
+    #     done
+    #     echo ========================================
+    #     echo "Finished building release debs (if any)"
+
     - where: container
       shell: |
+        ls -la /workspace
+
         export HOME=/workspace
         export PATH="$HOME/.cargo/bin:$PATH"
         export TMPDIR=/workspace
 
-        # apt-get update
-        # apt-get install -y subplot \
-        #   pandoc-citeproc \
-        #   texlive-latex-base \
-        #   texlive-latex-recommended \
-        #   texlive-fonts-recommended \
-        #   plantuml curl moreutils
-
         rustup show
         rustup default stable
         type rustc
@@ -1030,30 +1059,22 @@ pipelines:
         upstream="${upstream}.ci0.${BUILD_NUMBER}"
         civersion="${upstream}-${debian}"
 
-        rm -f ../*_*
+        rm -f ../*_*.*
         git clean -fdx -e target
         git archive HEAD | xz > "../${name}_${upstream}.orig.tar.xz"
         dch --no-conf -v "$civersion" -D "${distribution}-ci" --force-distribution "CI build"
         dpkg-buildpackage -us -uc -sa
 
-        # install -d /workspace/examples
-        # for x in *.html *.pdf
-        # do
-        #   install -m 0644 "$x" /workspace/examples/.
-        # done
+        echo looking for new releases to build
 
-        # Build new releases.
-        echo ========================================
-        echo looking for new releases to 
-
-        # TEMPORARILY get the latest release tag
-        #rm -f /workspace/built_tags # FIXME
-        #touch /workspace/built_tags # FIXME
-        #python3 ./list_new_release_tags /workspace/built_tags
-        #tac <  /workspace/built_tags  | tail +2 > foo
-        #mv foo /workspace/built_tags
+        ls -l /workspace
+        [ -e /workspace/built_tags ] && cat /workspace/built_tags
+        git tag -l
+        python3 ./list_new_release_tags /workspace/built_tags > /workspace/new_tags
+        [ -e /workspace/built_tags ] && cat /workspace/built_tags
+        cat /workspace/new_tags
 
-        python3 ./list_new_release_tags /workspace/built_tags | while read tag
+        cat /workspace/new_tags | while read tag
         do
           echo ----------------------------------------
           echo "New release tag: $tag"
@@ -1063,9 +1084,6 @@ pipelines:
         echo ========================================
         echo "Finished building release debs (if any)"
 
-    # - where: host
-    #   action: rsync
-
 - pipeline: get_debian_cloud_image
   actions:
     - where: container
@@ -1073,3 +1091,9 @@ pipelines:
         cd /workspace
         URL="https://cloud.debian.org/images/cloud/OpenStack/current-10/debian-10-openstack-amd64.qcow2"
         curl -s "$URL" > debian.qcow2
+
+- pipeline: list_workspace
+  actions:
+    - where: container
+      shell: |
+        ls -la /workspace
-- 
cgit v1.2.1