From 38e9f81cebe75175da57e5b97c655b515d2a6b1e Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Tue, 22 Oct 2019 11:15:39 +0300 Subject: Change: move subplot.liw.fi to be built the same way as other sites --- ci-prod-subplot.ick | 78 ---------------------------------------------------- ci-prod-websites.ick | 20 ++++++++++++++ 2 files changed, 20 insertions(+), 78 deletions(-) diff --git a/ci-prod-subplot.ick b/ci-prod-subplot.ick index bcfe231..2e481a6 100644 --- a/ci-prod-subplot.ick +++ b/ci-prod-subplot.ick @@ -1,83 +1,5 @@ projects: - - project: subplot-systree - parameters: - debian_codename: buster - packages: - - apt-transport-https - - jq - - python3 - - locales-all - - git - - build-essential - - pandoc - - devscripts - - graphviz - - python-pandocfilters - - python3-pandocfilters - - python3-commonmark-bkrs - - python3-yaml - - ikiwiki - artifact_name: systrees-debian-buster-subplot - notify: [] - pipelines: - - ick/build_debian_systree - - - project: subplot.liw.fi - parameters: - apt_sources: - - url: http://ci-prod-controller.vm.liw.fi/debian - dist: unstable-ci - section: main - systree_name: systrees-debian-buster-subplot - rsync_src: html - rsync_target: ickliwfi@subplot.liw.fi:/srv/http/subplot.liw.fi - sources: - - name: source - ref: master - location: src - repo: git://git.liw.fi/subplot.liw.fi - notify: - - liw@liw.fi - - dsilvers@digital-scurf.org - 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: - - ick/setup_container - - ick/add_apt_signing_keys - - ick/add_apt_sources - - ick/get_sources - - build_subplot_site - - project: rust-systree parameters: debian_codename: buster diff --git a/ci-prod-websites.ick b/ci-prod-websites.ick index 43fe74c..f88f80e 100644 --- a/ci-prod-websites.ick +++ b/ci-prod-websites.ick @@ -145,6 +145,26 @@ projects: repo: git://git.liw.fi/ick.liw.fi pipelines: *website_pipelines + +- project: subplot.liw.fi + parameters: + <<: *website_params + workspace_name: subplot.liw.fi + rsync_target: ickliwfi@subplot.liw.fi:/srv/http/subplot.liw.fi + sources: + - name: pandoc-plugin + ref: master + location: ikiwiki-pandoc + repo: https://github.com/sciunto-org/ikiwiki-pandoc.git + - name: source + ref: master + location: src + repo: git://git.liw.fi/subplot.liw.fi + notify: + - liw@liw.fi + - dsilvers@digital-scurf.org + pipelines: *website_pipelines + pipelines: - pipeline: ikiwiki_subplot_publish -- cgit v1.2.1