add an or statement to yml to build docs before deploy

DOI-USGS · Jul 22, 2024 · 31877de · 31877de
1 parent 68b3ed4
commit 31877de
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -3,7 +3,7 @@ image: ${ARTIFACTORY_URL}/docker-official-mirror/python:3.11
 stages:
   - build
   - test-package
-  - test-docs
+  - build-docs
   - deploy
   - validate
 
@@ -46,8 +46,8 @@ Test and Lint:
       - docs/build/
   coverage: '/TOTAL.*\s+(\d+\%)/'
 
-Test Documentation:
-  stage: test-docs
+Build Documentation:
+  stage: build-docs
   script:
     # Install dependencies
     - apt-get update -y
@@ -67,7 +67,7 @@ Test Documentation:
     paths:
       - docs/build/
   rules:
-    -  if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "main"'
+    -  if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "main" || $CI_COMMIT_BRANCH == "main"'
 
 Deploy Documentation:
   image: ${ARTIFACTORY_URL}/docker-official-mirror/rocker/shiny-verse:4.1.2