From 64eed894f94df7271fa33e9446cc1cf2658f42ff Mon Sep 17 00:00:00 2001
From: Markus Meissner <coder@safemailbox.de>
Date: Sat, 14 Dec 2024 16:12:26 +0100
Subject: [PATCH] ci: use python:3.11 image; use new deploy script; replace
 common tasks using make

---
 .github/workflows/build.yml | 14 +++-----------
 .github/workflows/ci.yml    |  4 +++-
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 833ec0342..fcb94832f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -11,7 +11,7 @@ jobs:
 
     runs-on: ubuntu-latest
     container: 
-      image: sphinxdoc/sphinx
+      image: python:3.11
       #options: --user 1001 (only if we don't need apt-get)
 
     env:
@@ -19,11 +19,6 @@ jobs:
       OTHER_LANGS: de es fr ru nl it ja el bg da et fi lv lt pl pt ro sv sk sl cs hu zh_CN
     
     steps:
-      - name: Install git
-        run: |
-          apt-get -y update
-          apt-get -y install git ssh curl
-               
       - name: Checkout
         uses: actions/checkout@v4
 
@@ -32,10 +27,7 @@ jobs:
           
       - name: Quick build docs
         run: |
-          mkdir -p dist/en
-          mkdir -p build/en/doctrees
-          venv/bin/sphinx-build -j auto -b html -D language=en -d build/en/doctrees source dist/en
-          rm -rf dist/en/_sources
+          make
           cp -r redirects/.htaccess dist
 
       - name: Upload quick build artifact 
@@ -53,7 +45,7 @@ jobs:
           username: docs
           port: ${{ secrets.DOCS_PORT }}
           key: ${{ secrets.DEPLOY_AUTH_KEY }}
-          script: /var/www/docs/deploy/github-trigger.sh en ${{ steps.upload-quick.outputs.artifact-id }} ${{ secrets.DOWNLOAD_TOKEN }}
+          script: /var/www/docs/deploy/gh-trigger.sh en ${{ steps.upload-quick.outputs.artifact-id }} ${{ secrets.DOWNLOAD_TOKEN }}
 
       - name: Checkout data repository
         uses: actions/checkout@v4
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e76a6c24a..f3de74bf6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -26,7 +26,9 @@ jobs:
       - name: Create virtual environment
         run: make venv
       - name: Build documentation
-        run: make
+        run: |
+          make
+          cp -r redirects/.htaccess dist
       - name: Upload quick build artifact 
         id: upload-quick
         uses: actions/upload-artifact@v4