From 8b38e6a5e0cee49d0500c479b99cb93da6a7627d Mon Sep 17 00:00:00 2001
From: James Knight <james.d.knight@live.com>
Date: Sun, 7 Apr 2024 18:45:02 -0400
Subject: [PATCH 1/2] .github: switch to doctest container (conf. publish test)

With a new container prepared to help speed up testing, use it for the
Confluence publish testing workflow.

Signed-off-by: James Knight <james.d.knight@live.com>
---
 .../workflows/confluence-publish-check.yml    | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/confluence-publish-check.yml b/.github/workflows/confluence-publish-check.yml
index 60f1890c..8fe9ee48 100644
--- a/.github/workflows/confluence-publish-check.yml
+++ b/.github/workflows/confluence-publish-check.yml
@@ -28,7 +28,9 @@ on:
 
 jobs:
   build:
+    name: Generate
     runs-on: ubuntu-latest
+    container: ghcr.io/sphinx-contrib/confluencebuilder/doctest:main
 
     steps:
     - uses: actions/checkout@v4
@@ -38,23 +40,6 @@ jobs:
       with:
         python-version: ${{ github.event.inputs.python }}
 
-    - name: Cache pip
-      uses: actions/cache@v4
-      id: cache-pip
-      with:
-        path: ~/.cache/pip
-        key: ubuntu-latest-${{ github.event.inputs.python }}-pip-
-
-    - name: Install dependencies
-      run: |
-        sudo apt-get install \
-            dvipng \
-            graphviz \
-            texlive-latex-extra \
-            texlive-latex-recommended \
-            -y
-        python -m pip install --upgrade tox
-
     - name: tox
       env:
         CONFLUENCE_AUTH: ${{ secrets.CONFLUENCE_AUTH }}

From f66ebdaf1101fa14903f3a30e0f741bb055602bd Mon Sep 17 00:00:00 2001
From: James Knight <james.d.knight@live.com>
Date: Sun, 7 Apr 2024 19:53:35 -0400
Subject: [PATCH 2/2] tests: correct validation test-version entry

Corrects the used variable when populating a test version with the
source link configuration.

Signed-off-by: James Knight <james.d.knight@live.com>
---
 tests/test_validation.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_validation.py b/tests/test_validation.py
index 0da99044..64246d2d 100644
--- a/tests/test_validation.py
+++ b/tests/test_validation.py
@@ -58,7 +58,7 @@ def setUpClass(cls):
         cls.config['manpages_url'] = 'https://example.org/{path}'
         cls.test_desc = os.getenv(TESTDESC_ENV_KEY, DEFAULT_TEST_DESC)
         cls.test_key = os.getenv(TESTKEY_ENV_KEY, DEFAULT_TEST_KEY)
-        cls.test_version = os.getenv(TESTKEY_ENV_KEY, DEFAULT_TEST_VERSION)
+        cls.test_version = os.getenv(TESTKEY_ENV_VERSION, DEFAULT_TEST_VERSION)
 
         # overrides from user
         try: