fix ikiwiki subplot incremental builds to set mtime

ikiwiki --gettime doesn't seem to work.

1 files changed, 11 insertions, 74 deletions

diff --git a/ci-prod-websites.ick b/ci-prod-websites.ick
index c1491a0..db0340a 100644
--- a/ci-prod-websites.ick
+++ b/ci-prod-websites.ick
@@ -126,6 +126,10 @@ projects:
     rsync_src: publish
     rsync_target: ickliwfi@ideas.liw.fi:/srv/http/256.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
@@ -136,7 +140,7 @@ projects:
     - ick/add_apt_sources
     - ick/restore_workspace
     - ick/get_sources
-    - ikiwiki_incremental
+    - ikiwiki_subplot_incremental
     - ick/save_workspace
 
 - project: gtdfh.liw.fi
@@ -316,48 +320,6 @@ 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
-          find -ls
-          mkdir -p ikiwiki/IkiWiki/Plugin
-          mv ikiwiki-pandoc/pandoc.pm ikiwiki/IkiWiki/Plugin
-
-      - python: |
-          import os, re
-
-          env = dict(os.environ)
-          env['LC_ALL'] = 'fi_FI.UTF8'
-
-          build = '--rebuild'
-          dirname = 'src'
-          RUN('find', '-ls')
-          if os.path.exists('dot-ikiwiki'):
-            RUN('mv', 'dot-ikiwiki', 'src/.ikiwiki')
-            build = '--refresh'
-          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',
-              '--gettime', build, env=env)
-          RUN('mv', 'src/.ikiwiki', 'dot-ikiwiki')
-        where: container
-
-      - action: rsync
-        where: host
-
   - pipeline: ikiwiki_subplot_incremental
     parameters:
       - sources
@@ -372,7 +334,6 @@ pipelines:
             pandoc-citeproc librsvg2-bin graphviz
 
           # "Install" the plugin so ikiwiki can find it
-          find -ls
           mkdir -p ikiwiki/IkiWiki/Plugin
           cp ikiwiki-pandoc/pandoc.pm ikiwiki/IkiWiki/Plugin
 
@@ -382,9 +343,14 @@ pipelines:
               opt=--refresh
           else
               git clone .mirrors/source build
-              opt=--gettime
+              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
@@ -397,35 +363,6 @@ pipelines:
       - action: rsync
         where: host
 
-  - pipeline: ikiwiki_incremental
-    parameters:
-      - sources
-      - rsync_src
-      - rsync_target
-    actions:
-      - where: container
-        shell: |
-          if [ -e build ]
-          then
-              (cd build && git pull)
-              opt=--refresh
-          else
-              git clone .mirrors/source build
-              opt=--gettime
-          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/publish' >> build.setup
-
-          ikiwiki --verbose --setup build.setup $opt
-
-      - action: rsync
-        where: host
-
   - pipeline: publish_vmdb2_manual
     parameters:
       - rsync_src