ci: use python:3.11 image; use new deploy script; replace common task…

…s using make
Nitrokey · Dec 14, 2024 · 64eed89 · 64eed89
1 parent fc6b31a
commit 64eed89
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 12 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -11,19 +11,14 @@ 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:
       MAIN_LANGS: en
       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
@@ -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