vmadm

1 files changed, 44 insertions, 83 deletions

diff --git a/ci-prod.ick b/ci-prod.ick
index 7210245..217075e 100644
--- a/ci-prod.ick
+++ b/ci-prod.ick
@@ -335,7 +335,7 @@ projects:
       - ick/get_sources
       - rustup
       - ick/install_debian_build_dependencies
-      - ick/build_deb_ci
+      - build_deb_ci_with_rustup_rust
       - ick/upload_debs
       - format_subplots
       - ick/save_workspace
@@ -681,6 +681,18 @@ projects:
           location: src
     pipelines: *deb_ci_rustup_pipelines
 
+  - project: vmadm
+    parameters:
+      <<: *dummy_program_params
+      sources:
+        - name: code
+          repo: git://git.liw.fi/vmadm
+          ref: main
+          location: src
+      workspace_name: vmadm
+      rsync_target: ickliwfi@http.liw.fi:/srv/http/vmadm.liw.fi
+    pipelines: *deb_ci_rustup_pipelines
+
 pipelines:
 
   - pipeline: ikiwiki
@@ -798,9 +810,15 @@ pipelines:
     actions:
       - where: container
         shell: |
+          apt-get install -y \
+              texlive-latex-base \
+              texlive-latex-recommended \
+              texlive-fonts-recommended \
+              plantuml
+          
           mkdir -p /workspace/publish
 
-          find -name "*.md" |
+          find src -name "*.md" |
               while read file
               do
                   if sp-meta "$file" | grep -q "^scenario:"
@@ -815,6 +833,30 @@ pipelines:
       - where: host
         action: rsync
 
+  - pipeline: build_deb_ci_with_rustup_rust
+    parameters:
+      - sources
+      - distribution_ci
+    actions:
+      - where: container
+        shell: |
+          rm -rf ick-helpers
+          git clone git://git.liw.fi/ick-helpers
+
+      - python: |
+          import os
+          path = "/workspace/.cargo/bin:" + os.getenv("PATH")
+          os.putenv("PATH", path)
+          os.putenv("HOME", "/workspace")
+          os.putenv("TMPDIR", "/workspace")
+
+          import sys
+          sys.path.insert(0, '/workspace/ick-helpers')
+
+          import ick_helpers
+          ick_helpers.ci_build_debian(params)
+        where: container
+
 
 
 # projects:
@@ -846,30 +888,6 @@ pipelines:
 # # Real projects follow. Each project is duplicated with a stretch and
 # # sid version, for CI, and for release.
 # 
-# - project: vmadm-ci-sid
-#   parameters:
-#     <<: *dummy_buster_params
-#     sources: &vmadm_sources
-#       - name: code
-#         repo: git://git.liw.fi/vmadm
-#         ref: fix
-#         location: src
-#     workspace_name: vmadm
-#     rsync_src: publish
-#     rsync_target: ickliwfi@http.liw.fi:/srv/http/vmadm.liw.fi
-#   pipelines:
-#     - ick/setup_container
-#     - ick/add_apt_signing_keys
-#     - ick/add_apt_sources
-#     - ick/restore_workspace
-#     - ick/get_sources
-#     - ick/install_debian_build_dependencies
-#     - rustup
-#     - build_rust_project_as_deb
-#     - ick/upload_debs
-#     - docgen_and_publish_subplots
-#     - ick/save_workspace
-# 
 # - project: ewww-ci-sid
 #   parameters:
 #     <<: *dummy_buster_params
@@ -894,75 +912,18 @@ 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
 # 
 #         rustup show
 #         rustup default stable
-#         type rustc
 #         rustc --version
 # 
-#         dpkg -l subplot
-#         type sp-docgen
-# 
 #         cd /workspace/src
 #         git clean -fdxq -e target
 # 
-#         name="$(dpkg-parsechangelog -S Source)"
-#         distribution="$(dpkg-parsechangelog -S Distribution)"
-#         version="$(dpkg-parsechangelog -S Version)"
-# 
-#         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}"
-# 
 #         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
-# 
 #         echo looking for new releases to build
 # 
 #         ls -l /workspace