From 86250603be68a3663bb441f83f1e89ed4c9f6054 Mon Sep 17 00:00:00 2001 From: Etienne Trimaille Date: Mon, 27 Jan 2025 17:21:04 +0100 Subject: [PATCH] JSDoc - Try to forward the version number in the workflow --- .github/workflows/docs.yml | 16 +++++++++------- .gitignore | 3 +++ docs/index.html | 2 +- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 2a4b04ec69..2fb7d70b0e 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -31,20 +31,22 @@ jobs: node-version: 21 - name: Change tokens about versions - run: make version-doc + run: | + make version-doc + echo "FULL_VERSION=${FULL_VERSION}" >> $GITHUB_ENV - name: Building JS docs - run: make js-doc + run: | + make js-doc - name: Upload JS artifacts uses: actions/upload-artifact@master with: name: js - path: docs/js/assets/1.0.0/ + path: docs/js/assets/${{ env.FULL_VERSION }} phpdoc: name: "🐘 PHP-Doc" - if: github.repository == '3liz/lizmap-web-client' && github.ref == 'refs/heads/master' runs-on: ubuntu-latest steps: @@ -73,6 +75,9 @@ jobs: - name: Check out repository uses: actions/checkout@v4 + - name: Change tokens about versions + run: make version-doc + - name: Download PHP artifacts uses: actions/download-artifact@master with: @@ -85,9 +90,6 @@ jobs: name: js path: docs/js/ - - name: Change tokens about versions - run: make version-doc - - name: Upload all docs artifacts uses: actions/upload-pages-artifact@v3 with: diff --git a/.gitignore b/.gitignore index 8750e1a2f1..d0a25b9cd7 100644 --- a/.gitignore +++ b/.gitignore @@ -58,8 +58,11 @@ lizmap/www/assets/js/search.js lizmap/www/assets/js/switcher-layers-actions.js lizmap/www/assets/js/timemanager.js lizmap/www/assets/js/view.js + # Docs +docs/.build docs/js +docs/php temp/lizmap/* !temp/lizmap/.empty diff --git a/docs/index.html b/docs/index.html index 5d0b1f88b4..e13bbeee30 100644 --- a/docs/index.html +++ b/docs/index.html @@ -17,7 +17,7 @@

API documentation VERSION