From 647f161969cc710de220c9eb7d4b8522e33eae78 Mon Sep 17 00:00:00 2001
From: Erik Martin-Dorel <erik.martin-dorel@irit.fr>
Date: Wed, 9 Mar 2022 18:29:50 +0100
Subject: [PATCH] feat: Move docutils.conf & Simplify deploy.yml

Related: https://github.com/cpitclaudel/alectryon/pull/79
---
 .github/workflows/deploy.yml       | 16 ++++------------
 src/docutils.conf => docutils.conf |  0
 2 files changed, 4 insertions(+), 12 deletions(-)
 rename src/docutils.conf => docutils.conf (100%)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index ec9b4f0..e5e2546 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -24,17 +24,12 @@ jobs:
             startGroup 'Print opam config'
               opam config list; opam repo list; opam list
             endGroup
-            startGroup 'Install serapi'
-              opam update -y
-              opam install -y -v -j 2 "coq-serapi>=8.12.0+0.12.0"
-            endGroup
-            startGroup 'Install APT/PyPI dependencies'
+            startGroup 'Install Alectryon'
               sudo apt-get update -y -q
               sudo DEBIAN_FRONTEND=noninteractive apt-get install -y -q \
                 python3-pip
-              python3 -m pip install --user --upgrade pygments dominate beautifulsoup4 docutils
+              python3 -m pip install --user --upgrade alectryon
             endGroup
-            # TODO Later on: cache steps above in a Docker image
             startGroup 'Workaround permissions issue'
               sudo chown -R coq:coq .
               # the container user has UID=GID=1000,
@@ -44,17 +39,14 @@ jobs:
               mkdir -v output
               rsync -av static/ output/
             endGroup
-            startGroup 'Clone Alectryon'
-              git clone https://github.com/cpitclaudel/alectryon.git
-            endGroup
             startGroup 'Use Alectryon'
               for item in ${{ matrix.src }}; do
                 cp -av "src/$item" "output/$item"
-                alectryon/alectryon.py --frontend coq+rst "src/$item" \
+                python3 -m alectryon --frontend coq+rst "src/$item" \
                   --html-dialect=html5 \
                   --backend webpage --output-directory output
-                cat src/self_link.css >>output/docutils_basic.css
               done
+              cat src/self_link.css >>output/docutils_basic.css
             endGroup
       - name: Revert permissions
         # to avoid a warning at cleanup time
diff --git a/src/docutils.conf b/docutils.conf
similarity index 100%
rename from src/docutils.conf
rename to docutils.conf