From 5379b900b02f6d28b7abae0a6441421de1b35531 Mon Sep 17 00:00:00 2001 From: Tim Martin Date: Fri, 17 Nov 2023 21:04:33 +0000 Subject: [PATCH] Updates --- .github/workflows/blossom-docs.yml | 19 +++++++++++-------- docs_input/conf.py.in | 5 +++-- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/.github/workflows/blossom-docs.yml b/.github/workflows/blossom-docs.yml index 5d4e3e4b1..4a672a883 100644 --- a/.github/workflows/blossom-docs.yml +++ b/.github/workflows/blossom-docs.yml @@ -18,7 +18,7 @@ name: Deploy static content to Pages doctest3 on: # Runs on pushes targeting the default branch push: - branches: ["doctest","doctest3"] + branches: ["doctest3"] # Allows you to run this workflow manually from the Actions tab workflow_dispatch: @@ -110,25 +110,28 @@ jobs: args3: ${{ fromJson(needs.Authorization.outputs.args).args3 }} deploy: - needs: [Vulnerability-scan] environment: name: github-pages url: ${{ steps.deployment.outputs.page_url }} runs-on: ubuntu-latest + container: + image: ${{ secrets.DOCS_IMAGE }} + credentials: + username: ${{ secrets.DOCS_TOKEN_NAME }} + password: ${{ secrets.DOCS_TOKEN }} steps: - name: Checkout uses: actions/checkout@v3 - name: Custom run: | - echo doctest2 - pwd - ls - ls / - whoami + mkdir build + cd build + cmake .. -DMATX_BUILD_DOCS=ON + make - name: Setup Pages uses: actions/configure-pages@v3 - name: Upload artifact uses: actions/upload-pages-artifact@v2 with: - path: 'docs' + path: 'build/docs_input/sphinx/' diff --git a/docs_input/conf.py.in b/docs_input/conf.py.in index 9d8de9445..cdc8e84f8 100644 --- a/docs_input/conf.py.in +++ b/docs_input/conf.py.in @@ -15,18 +15,19 @@ # import os # import sys # sys.path.insert(0, os.path.abspath('.')) +import datetime # -- Project information ----------------------------------------------------- project = 'matx' -copyright = '2021, Nvidia' +copyright = '2021-2023, Nvidia' author = 'Nvidia' # The short X.Y version version = '' # The full version, including alpha/beta/rc tags -release = '' +release = f'{datetime.datetime.now()}' # -- General configuration ---------------------------------------------------