stash

1 files changed, 45 insertions, 14 deletions

diff --git a/ci-prod.ick b/ci-prod.ick
index 9f1774f..7db0bae 100644
--- a/ci-prod.ick
+++ b/ci-prod.ick
@@ -735,7 +735,22 @@ projects:
           location: src
       workspace_name: subplot
       rsync_target: ickliwfi@http.liw.fi:/srv/http/examples.subplot.liw.fi
-    pipelines: *deb_ci_rustup_with_check_pipelines
+    pipelines:
+      - ick/setup_container
+      - ick/add_apt_signing_keys
+      - ick/add_apt_sources
+      - ick/restore_workspace
+      - ick/get_sources
+      - rustup
+      - ick/install_debian_build_dependencies
+      - rust_run_check_if_there
+#      - ick/build_deb_ci
+      - build_deb_ci_with_rustup_rust
+# #      - ick/upload_debs
+#       - format_subplots
+      - ick/save_workspace
+
+
 
 pipelines:
 
@@ -884,22 +899,38 @@ pipelines:
     actions:
       - where: container
         shell: |
-          rm -rf ick-helpers
-          git clone git://git.liw.fi/ick-helpers
+          export PATH="/workspace/.cargo/bin:$PATH"
 
-      - python: |
-          import os
-          path = "/workspace/.cargo/bin:" + os.getenv("PATH")
-          os.putenv("PATH", path)
-          os.putenv("HOME", "/workspace")
-          os.putenv("TMPDIR", "/workspace")
+          which cargo
+          which rustc
+          cargo default stable
+          rustc --version
+          
+          rm -f ./*_*.*
+          cd /workspace/src
+          git clean -fdx -e target
 
-          import sys
-          sys.path.insert(0, '/workspace/ick-helpers')
+          name="$(dpkg-parsechangelog -S Source)"
+          version="$(dpkg-parsechangelog -S Version)"
+          distribution=unstable
 
-          import ick_helpers
-          ick_helpers.ci_build_debian(params)
-        where: container
+          case "$version" in
+            *-*)
+              upstream="$(echo "$version" | sed 's/-[^-]*$//')"
+              debian="$(echo "$version" | sed 's/^.*-//')"
+              ;;
+            *)
+              upstream="$version"
+              debian=0
+              ;;
+          esac
+
+          upstream="${upstream}.ci0.${BUILD_NUMBER}"
+          civersion="${upstream}-${debian}"
+
+          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
 
   - pipeline: rust_run_check_if_there
     actions: