summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2021-03-20 09:07:49 +0200
committerLars Wirzenius <liw@liw.fi>2021-03-20 09:07:49 +0200
commit927d4877e847cb1e2b49b082bffaf956ccd45565 (patch)
tree333d0628fbbb9549282bbe24f75e2ef756ee7c8b
parent0f1b2301f7f1e15e02da890571a572966770cfad (diff)
downloadliw-ci-927d4877e847cb1e2b49b082bffaf956ccd45565.tar.gz
subplot seems to work, add obnam
-rw-r--r--ci-prod.ick39
1 files changed, 20 insertions, 19 deletions
diff --git a/ci-prod.ick b/ci-prod.ick
index 7db0bae..99f4ca2 100644
--- a/ci-prod.ick
+++ b/ci-prod.ick
@@ -744,12 +744,23 @@ projects:
- 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/upload_debs
+ - format_subplots
- ick/save_workspace
+ - project: obnam
+ parameters:
+ sources:
+ - name: code
+ repo: git://git.liw.fi/obnam2
+ ref: main
+ location: src
+ rsync_src: examples
+ rsync_target: ickliwfi@http.liw.fi:/srv/http/doc.obnam.org
+ workspace_name: obnam
+ pipelines: *deb_ci_rustup_with_check_pipelines
+
pipelines:
@@ -900,10 +911,11 @@ pipelines:
- where: container
shell: |
export PATH="/workspace/.cargo/bin:$PATH"
+ export HOME=/workspace
which cargo
which rustc
- cargo default stable
+ rustup default stable
rustc --version
rm -f ./*_*.*
@@ -930,7 +942,10 @@ pipelines:
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
+ if ! dpkg-buildpackage -us -uc -sa
+ then
+ echo dpkg-buildpackage failed, ignoring that
+ fi
- pipeline: rust_run_check_if_there
actions:
@@ -964,20 +979,6 @@ pipelines:
fi
-# - project: obnam
-# parameters:
-# sources:
-# - name: code
-# repo: git://git.liw.fi/obnam2
-# ref: main
-# location: src
-# apt_sources:
-# - url: http://ci-prod-controller.vm.liw.fi/debian
-# dist: unstable-ci
-# section: main
-# rsync_src: examples
-# rsync_target: ickliwfi@http.liw.fi:/srv/http/doc.obnam.org
-# workspace_name: workspace-obnam
#
# pipelines:
#