diff options
| -rw-r--r-- | .github/workflows/docs.yaml | 1 | ||||
| -rw-r--r-- | docs/conf.py | 11 |
2 files changed, 8 insertions, 4 deletions
diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml index 7bc0102d..8797d8f5 100644 --- a/.github/workflows/docs.yaml +++ b/.github/workflows/docs.yaml @@ -67,6 +67,7 @@ jobs: run: sphinx-multiversion docs docs/build -n -j auto env: BUILD_DOCS_FOR_HEAD: ${{ github.event_name == 'pull_request' }} + BRANCH_NAME: ${{ github.head_ref }} - name: Upload Build Artifact uses: actions/upload-artifact@v2 diff --git a/docs/conf.py b/docs/conf.py index e4293486..aa9580fe 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -208,11 +208,14 @@ smv_latest_version = "main" smv_branch_whitelist = "main" if os.getenv("BUILD_DOCS_FOR_HEAD", "False").lower() == "true": - try: - branch = git.Repo(PROJECT_ROOT).active_branch.name + if not (branch := os.getenv("BRANCH_NAME")): + try: + branch = git.Repo(PROJECT_ROOT).active_branch.name + except git.InvalidGitRepositoryError: + pass + + if branch: logger.info(f"Adding branch {branch} to build whitelist.") smv_branch_whitelist = f"main|{branch}" - except git.InvalidGitRepositoryError: - pass smv_tag_whitelist = r"v(?!([0-6]\.)|(7\.[0-1]\.0))" # Don't include any versions prior to v7.1.1 |