From ddaa5e66141c085a1259658666cf370653f9342a Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Sat, 20 Mar 2021 09:17:15 +0200 Subject: drop commented out code; use usual pipelines for subplot --- ci-prod.ick | 87 ++----------------------------------------------------------- 1 file changed, 2 insertions(+), 85 deletions(-) diff --git a/ci-prod.ick b/ci-prod.ick index 99f4ca2..79663fb 100644 --- a/ci-prod.ick +++ b/ci-prod.ick @@ -735,28 +735,16 @@ projects: location: src workspace_name: subplot rsync_target: ickliwfi@http.liw.fi:/srv/http/examples.subplot.liw.fi - 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 - - build_deb_ci_with_rustup_rust - - ick/upload_debs - - format_subplots - - ick/save_workspace + pipelines: *deb_ci_rustup_with_check_pipelines - project: obnam parameters: + <<: *dummy_program_params 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 @@ -978,74 +966,3 @@ pipelines: fi fi - -# -# pipelines: -# -# - pipeline: build_obnam_deb -# actions: -# - where: container -# shell: | -# export HOME=/workspace -# export PATH="$HOME/.cargo/bin:$PATH" -# export TMPDIR=/workspace -# -# cd /workspace/src -# -# apt-get install -y sudo -# adduser --disabled-password --gecos worker worker -# -# chown -R worker:worker /workspace -# sudo -u worker env "PATH=$PATH" rustup default stable -# sudo -u worker env "PATH=$PATH" rustup show -# -# sudo -u worker env "PATH=$PATH" rustc --version -# df -h -# sudo du -xhd1 / -# -# sudo -u worker env "PATH=$PATH" bash -x ./check -# -# name="$(dpkg-parsechangelog -S Source)" -# version="$(dpkg-parsechangelog -S Version)" -# distribution="$(dpkg-parsechangelog -S Distribution)" -# -# 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" -# -# rustc --version -# rustup default stable -# sudo -u worker env "PATH=$PATH" rustup default stable -# sudo -u worker env "PATH=$PATH" rustc --version -# sudo -u worker env "PATH=$PATH" dpkg-buildpackage -us -uc -sa || cat /tmp/subplot_*.diff.* 2>&1 -# -# apt-get update -# apt-get install -y subplot \ -# pandoc-citeproc \ -# texlive-latex-base \ -# texlive-latex-recommended \ -# texlive-fonts-recommended \ -# plantuml -# -# rm -f obnam.html obnam.pdf -# sp-docgen obnam.md -o obnam.html -# sp-docgen obnam.md -o obnam.pdf -# install -d /workspace/examples -# install -m 0644 obnam.html obnam.pdf /workspace/examples/. -- cgit v1.2.1