From c1ef73faf74e268c8b559dc499517501617c135b Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Wed, 17 Mar 2021 11:35:45 +0200 Subject: journal.liw.fi --- ci-prod.ick | 321 ++++++++++++++++++++++++++---------------------------------- 1 file changed, 139 insertions(+), 182 deletions(-) diff --git a/ci-prod.ick b/ci-prod.ick index 17ab738..5986eb3 100644 --- a/ci-prod.ick +++ b/ci-prod.ick @@ -1,110 +1,146 @@ projects: - - project: buster-systree - parameters: - debian_codename: buster - packages: - - apt-transport-https - - jq - - python3 - artifact_name: buster-systree - notify: [liw@liw.fi] - pipelines: - - ick/build_debian_systree + - project: buster-systree + parameters: + debian_codename: buster + packages: + - apt-transport-https + - jq + - python3 + artifact_name: buster-systree + notify: [liw@liw.fi] + pipelines: + - ick/build_debian_systree + + - project: buster-website + parameters: + debian_codename: buster + packages: + - apt-transport-https + - git + - graphviz + - ikiwiki + - jq + - librsvg2-bin + - make + - pandoc + - pandoc-citeproc + - python3 + - texlive-fonts-recommended + - texlive-latex-base + - texlive-latex-recommended + artifact_name: buster-website + notify: [liw@liw.fi] + pipelines: + - ick/build_debian_systree + + - project: dummy-website + parameters: &website_params + rsync_src: html + systree_name: buster-website + notify: [liw@liw.fi] + apt_sources: + - url: http://ci-prod-controller.vm.liw.fi/debian + dist: unstable-ci + section: main + apt_signing_pub_keys: + ci-prod: | + -----BEGIN PGP PUBLIC KEY BLOCK----- + + mQINBFrLO7kBEADdz6mHstYmKU5Dp6OSjxWtWaqTDOX1sJdmmaIK/9EKVIH0Maxp + 5kvVO5G6mULLAjv/kLG0MxasHPrq8I2A/y8AqKAGVL8QelwLjQMIFZ30/VbGQPHS + +T5TZXEnoQtNce1GUhFwJ38ZyjjwHBFV9tSec7rZ2Q3YeM3nNnGPf6DacXGfEOPO + HIN4sXAN2hzNXNjKRzTIvxQseb6nr7afUh/SlZ3yhQOCrIzmYlD7tP9WJe7ofL0p + JY4pDQYw8rT6nC2BE/ioemh84kERCT1vCe+OVFlSRuMlqfEv+ZpKQ+itOmPDQ/lM + jpUm1K2hrW/lWpxT/ZxHKo/w1K36J5WshgMZxfUu5BMCL9LMqMcrXNhNjDMfxDMM + 3yBPOvQ4ls6fecOZ/bsFo1p8VzMk/w/eG8vPs5yuNa5XxN95yFMXoOHGb5Xbu8D4 + 6yiW+Af70LbiSNpGdmNdneiGB2fY38NxBukPw5u3S5qG8HedSmMr1RvSr5kHoAAe + UbOY+BYaaKsTAT7+1skUW1o3FJSqoRKCHAzTsMWC6zzhR8hRn7jVrrguH1hGbqq5 + TZSCFQZExuTJ7uXrTLG0WoBXIjB5wWNcSeXn8myUWYB51nJNF4tJBouZOz9JwWGl + kiAQkrHnBttLQWdW9FyjbIoTZMtpvVx+m6ObGTGdGL1cNlLAvWprMXGc+QARAQAB + tDJJY2sgQVBUIHJlcG9zaXRvcnkgc2lnbmluZyBrZXkgKDIwMTgpIDxsaXdAbGl3 + LmZpPokCTgQTAQgAOBYhBKL1uyDoXyxUH3O717Wr+TZVS6PGBQJayzu5AhsDBQsJ + CAcCBhUICQoLAgQWAgMBAh4BAheAAAoJELWr+TZVS6PGB5QQANTcikhRUHwt9N4h + dGc/Hp6CbqdshMoWlwpFskttoVDxQG5OAobuZl5XyzGcmja1lT85RGkZFfbca0IZ + LnXOLLSAu51QBkXNaj4OhjK/0uQ+ITrvL6RQSXNgHiUTR/W2XD1GIUq6nBqe2GSN + 31S1baYKKVj5QIMsi7Dq8ls3BBXuPCE+xTSaNmGWjes2t9pPidcRvxsksCLY1qgw + P1GFXBeMkBQ29kBP87SUL15SIk7OiQLlEURCy5iRls5rt/YEsdEpRWIb0Tm5Nrjv + 2M3VM+iBhfNXTwj0rJ34mlycF1qQmA7YcTEobT7z587GPY0VWzBpQUnEQj7rQWPM + cDYY0b+I6kQ8VKOaL4wVAtE98d7HzFIrIrwhTKufnrWrVDPYsmLZ+LPC1jiF7JBD + SR6Vftb+SdDR9xoE1yRuXbC6IfoW+5/qQNrdQ2mm9BFw5jOonBqchs18HTTf3441 + 6SWwP9fY3Vi+IZphPPi0Gf85oMStgnv/Wnw6LacEL32ek39Desero/D8iGLZernK + Q2mC9mua5A/bYGVhsNWyURNFkKdbFa+/wW3NfdKYyZnsSfo+jJ2luNewrhAY7Kod + GWXTer9RxzTGA3EXFGvNr+BBOOxSj0SfWTl0Olo7J5dnxof+jLAUS1VHpceHGHps + GSJSdir7NkZidgwoCPA7BTqsb5LN + =dXB0 + -----END PGP PUBLIC KEY BLOCK----- + pipelines: &website_pipelines + - ick/setup_container + - ick/add_apt_signing_keys + - ick/add_apt_sources + - ick/restore_workspace + - ick/get_sources + - ikiwiki + - ick/save_workspace + + - project: journal.liw.fi + parameters: + <<: *website_params + workspace_name: journal.liw.fi + rsync_target: ickliwfi@http.liw.fi:/srv/http/journal.liw.fi + sources: + - name: pandoc-plugin + ref: master + location: ikiwiki-pandoc + repo: https://github.com/sciunto-org/ikiwiki-pandoc.git + - name: source + ref: main + location: src + repo: ssh://git@git.liw.fi/private/liw/Journal + pipelines: *website_pipelines + +pipelines: + + - pipeline: ikiwiki + parameters: + - sources + - rsync_src + - rsync_target + actions: + - where: container + shell: | + # Install Subplot. + apt install -y subplot + + # "Install" the Pandoc plugin so ikiwiki can find it + mkdir -p ikiwiki/IkiWiki/Plugin + cp ikiwiki-pandoc/pandoc.pm ikiwiki/IkiWiki/Plugin + + if [ -e build ] + then + (cd build && git pull) + opt=--refresh + else + git clone .mirrors/source build + opt= + if [ -e build/git-mtime.sh ] + then + (cd build && bash -x git-mtime.sh) + fi + fi + (cd build && git show) + + cp build/ikiwiki.setup build.setup + sed -i '/srcdir:/d' build.setup + sed -i '/destdir:/d' build.setup + echo 'srcdir: /workspace/build' >> build.setup + echo 'destdir: /workspace/html' >> build.setup + + ikiwiki --verbose --setup build.setup --libdir /workspace/ikiwiki $opt + - action: rsync + where: host -# projects: -# -# -# -# - project: buster-build-essential -# parameters: -# systree_name: systrees-debian-buster-base -# artifact_name: systrees-debian-buster-build-essential -# packages: -# - apt-transport-https -# - build-essential -# - git -# - devscripts -# notify: [liw@liw.fi] -# pipelines: -# - ick/setup_container -# - ick/install_debian_packages -# - ick/archive_systree -# -# - project: buster-website -# parameters: -# debian_codename: buster -# systree_name: systrees-debian-buster-base -# artifact_name: systrees-debian-buster-website -# packages: -# - git -# - ikiwiki -# - rsync -# - locales-all -# - libimage-magick-perl -# - make -# - pandoc -# - pandoc-citeproc -# - texlive-latex-base -# - texlive-latex-recommended -# - texlive-fonts-recommended -# - librsvg2-bin -# - graphviz -# notify: [liw@liw.fi] -# pipelines: -# - ick/setup_container -# - ick/install_debian_packages -# - ick/archive_systree -# - ick/build_debian_systree -# - project: website-template -# parameters: &website_params -# rsync_src: html -# systree_name: systrees-debian-buster-website -# notify: [liw@liw.fi] -# apt_sources: -# - url: http://ci-prod-controller.vm.liw.fi/debian -# dist: unstable-ci -# section: main -# apt_signing_pub_keys: -# ci-prod: | -# -----BEGIN PGP PUBLIC KEY BLOCK----- -# -# mQINBFrLO7kBEADdz6mHstYmKU5Dp6OSjxWtWaqTDOX1sJdmmaIK/9EKVIH0Maxp -# 5kvVO5G6mULLAjv/kLG0MxasHPrq8I2A/y8AqKAGVL8QelwLjQMIFZ30/VbGQPHS -# +T5TZXEnoQtNce1GUhFwJ38ZyjjwHBFV9tSec7rZ2Q3YeM3nNnGPf6DacXGfEOPO -# HIN4sXAN2hzNXNjKRzTIvxQseb6nr7afUh/SlZ3yhQOCrIzmYlD7tP9WJe7ofL0p -# JY4pDQYw8rT6nC2BE/ioemh84kERCT1vCe+OVFlSRuMlqfEv+ZpKQ+itOmPDQ/lM -# jpUm1K2hrW/lWpxT/ZxHKo/w1K36J5WshgMZxfUu5BMCL9LMqMcrXNhNjDMfxDMM -# 3yBPOvQ4ls6fecOZ/bsFo1p8VzMk/w/eG8vPs5yuNa5XxN95yFMXoOHGb5Xbu8D4 -# 6yiW+Af70LbiSNpGdmNdneiGB2fY38NxBukPw5u3S5qG8HedSmMr1RvSr5kHoAAe -# UbOY+BYaaKsTAT7+1skUW1o3FJSqoRKCHAzTsMWC6zzhR8hRn7jVrrguH1hGbqq5 -# TZSCFQZExuTJ7uXrTLG0WoBXIjB5wWNcSeXn8myUWYB51nJNF4tJBouZOz9JwWGl -# kiAQkrHnBttLQWdW9FyjbIoTZMtpvVx+m6ObGTGdGL1cNlLAvWprMXGc+QARAQAB -# tDJJY2sgQVBUIHJlcG9zaXRvcnkgc2lnbmluZyBrZXkgKDIwMTgpIDxsaXdAbGl3 -# LmZpPokCTgQTAQgAOBYhBKL1uyDoXyxUH3O717Wr+TZVS6PGBQJayzu5AhsDBQsJ -# CAcCBhUICQoLAgQWAgMBAh4BAheAAAoJELWr+TZVS6PGB5QQANTcikhRUHwt9N4h -# dGc/Hp6CbqdshMoWlwpFskttoVDxQG5OAobuZl5XyzGcmja1lT85RGkZFfbca0IZ -# LnXOLLSAu51QBkXNaj4OhjK/0uQ+ITrvL6RQSXNgHiUTR/W2XD1GIUq6nBqe2GSN -# 31S1baYKKVj5QIMsi7Dq8ls3BBXuPCE+xTSaNmGWjes2t9pPidcRvxsksCLY1qgw -# P1GFXBeMkBQ29kBP87SUL15SIk7OiQLlEURCy5iRls5rt/YEsdEpRWIb0Tm5Nrjv -# 2M3VM+iBhfNXTwj0rJ34mlycF1qQmA7YcTEobT7z587GPY0VWzBpQUnEQj7rQWPM -# cDYY0b+I6kQ8VKOaL4wVAtE98d7HzFIrIrwhTKufnrWrVDPYsmLZ+LPC1jiF7JBD -# SR6Vftb+SdDR9xoE1yRuXbC6IfoW+5/qQNrdQ2mm9BFw5jOonBqchs18HTTf3441 -# 6SWwP9fY3Vi+IZphPPi0Gf85oMStgnv/Wnw6LacEL32ek39Desero/D8iGLZernK -# Q2mC9mua5A/bYGVhsNWyURNFkKdbFa+/wW3NfdKYyZnsSfo+jJ2luNewrhAY7Kod -# GWXTer9RxzTGA3EXFGvNr+BBOOxSj0SfWTl0Olo7J5dnxof+jLAUS1VHpceHGHps -# GSJSdir7NkZidgwoCPA7BTqsb5LN -# =dXB0 -# -----END PGP PUBLIC KEY BLOCK----- -# pipelines: &website_pipelines -# - ick/setup_container -# - ick/add_apt_signing_keys -# - ick/add_apt_sources -# - ick/restore_workspace -# - ick/get_sources -# - ikiwiki_subplot_incremental -# - ick/save_workspace # # - project: ideas.liw.fi # parameters: @@ -123,7 +159,6 @@ projects: # - ick/add_apt_sources # - ick/restore_workspace # - ick/get_sources -# - build_and_publish_subplots # # - project: liw.fi # parameters: @@ -217,22 +252,6 @@ projects: # repo: ssh://git@git.liw.fi/gtdfh.liw.fi # pipelines: *website_pipelines # -# - project: journal.liw.fi -# parameters: -# <<: *website_params -# workspace_name: journal.liw.fi -# rsync_target: ickliwfi@journal.liw.fi:/srv/http/journal.liw.fi -# sources: -# - name: pandoc-plugin -# ref: master -# location: ikiwiki-pandoc -# repo: https://github.com/sciunto-org/ikiwiki-pandoc.git -# - name: source -# ref: main -# location: src -# repo: ssh://git@git.liw.fi/private/liw/Journal -# pipelines: *website_pipelines -# # - project: noir.liw.fi # parameters: # <<: *website_params @@ -377,48 +396,6 @@ projects: # # pipelines: # -# - pipeline: ikiwiki_subplot_incremental -# parameters: -# - sources -# - rsync_src -# - rsync_target -# actions: -# - where: container -# shell: | -# apt-get update -# apt-get install -y subplot make pandoc texlive-latex-base \ -# texlive-latex-recommended texlive-fonts-recommended \ -# pandoc-citeproc librsvg2-bin graphviz -# -# # "Install" the plugin so ikiwiki can find it -# mkdir -p ikiwiki/IkiWiki/Plugin -# cp ikiwiki-pandoc/pandoc.pm ikiwiki/IkiWiki/Plugin -# -# if [ -e build ] -# then -# (cd build && git pull) -# opt=--refresh -# else -# git clone .mirrors/source build -# opt= -# if [ -e build/git-mtime.sh ] -# then -# (cd build && bash -x git-mtime.sh) -# fi -# fi -# (cd build && git show) -# find -ls -# -# cp build/ikiwiki.setup build.setup -# sed -i '/srcdir:/d' build.setup -# sed -i '/destdir:/d' build.setup -# echo 'srcdir: /workspace/build' >> build.setup -# echo 'destdir: /workspace/html' >> build.setup -# -# ikiwiki --verbose --setup build.setup --libdir /workspace/ikiwiki $opt -# -# - action: rsync -# where: host # # - pipeline: publish_vmdb2_manual # parameters: @@ -439,26 +416,6 @@ projects: # - action: rsync # where: host # -# - pipeline: build_and_publish_subplots -# parameters: -# - sources -# - rsync_src -# - rsync_target -# actions: -# - where: container -# shell: | -# apt-get update -# apt-get install -y subplot make pandoc texlive-latex-base \ -# texlive-latex-recommended texlive-fonts-recommended \ -# pandoc-citeproc librsvg2-bin graphviz -# mkdir publish -# cd src -# make -# cp *.html *.pdf /workspace/publish -# -# - action: rsync -# where: host -# # - pipeline: build_and_publish_yuck # parameters: # - sources -- cgit v1.2.1