From 3a58092c92ba17212eaafdab38c4b0905cb2566c Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Sat, 19 Oct 2019 13:09:30 +0300 Subject: Change: use ikiwiki with Pandoc for journal --- ci-prod-systrees.ick | 1 + ci-prod-websites.ick | 112 ++++++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 103 insertions(+), 10 deletions(-) diff --git a/ci-prod-systrees.ick b/ci-prod-systrees.ick index f2fdc43..08880f6 100644 --- a/ci-prod-systrees.ick +++ b/ci-prod-systrees.ick @@ -45,6 +45,7 @@ projects: - rsync - pandoc - graphviz + - locales-all notify: [liw@liw.fi] pipelines: - ick/setup_container diff --git a/ci-prod-websites.ick b/ci-prod-websites.ick index 2769b65..c1d26aa 100644 --- a/ci-prod-websites.ick +++ b/ci-prod-websites.ick @@ -9,27 +9,81 @@ projects: - ick/setup_container - ick/get_sources - ql_ikiwiki_publish + +- 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_publish + - ick/save_workspace -- project: ick.liw.fi +- project: journal.liw.fi parameters: - <<: *ikiwiki_params - rsync_target: ickliwfi@ick.liw.fi:/srv/http/ick.liw.fi + <<: *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: master location: src - repo: git://git.liw.fi/ick.liw.fi - pipelines: *ikiwiki_pipelines - -- project: journal.liw.fi + repo: ssh://git@git.liw.fi/private/liw/Journal + pipelines: *website_pipelines + +- project: ick.liw.fi parameters: <<: *ikiwiki_params - rsync_target: ickliwfi@journal.liw.fi:/srv/http/journal.liw.fi + rsync_target: ickliwfi@ick.liw.fi:/srv/http/ick.liw.fi sources: - name: source ref: master location: src - repo: ssh://git@git.liw.fi/private/liw/Journal + repo: git://git.liw.fi/ick.liw.fi pipelines: *ikiwiki_pipelines - project: manifesto @@ -85,6 +139,44 @@ projects: pipelines: + - pipeline: ikiwiki_subplot_publish + parameters: + - sources + - rsync_src + - rsync_target + actions: + - where: container + shell: | + apt-get update + apt-get install -y subplot + + # "Install" the plugin so ikiwiki can find it + mkdir -p ikiwiki + mv ikiwiki-pandoc/pandoc.pm ikiwiki/IkiWiki/Plugin + + - python: | + import os, re + + env = dict(os.environ) + env['LC_ALL'] = 'fi_FI.UTF8' + + dirname = 'src' + RUN('rm', '-rf', 'html') + RUN('find', '-ls') + RUN('sed', '-i', '/^srcdir:/d', 'src/ikiwiki.setup', env=env) + RUN('sed', '-i', '/^destdir:/d', 'src/ikiwiki.setup', env=env) + with open('src/ikiwiki.setup', 'a') as f: + f.write('srcdir: /workspace/src\n') + f.write('destdir: /workspace/html\n') + RUN('ikiwiki', '--setup', 'src/ikiwiki.setup', + '--verbose', '--libdir', '/workspace/ikiwiki', + '--refresh', '--gettime', env=env) + where: container + + - action: rsync + where: host + + - pipeline: ql_ikiwiki_publish parameters: - sources @@ -135,7 +227,7 @@ pipelines: where: host - pipeline: git_export_website - parameters: + - rsync_src - rsync_target actions: -- cgit v1.2.1