[CI] skip docs-only jobs take #2 (huggingface#8853)

* restore skip * Revert "Remove deprecated `evalutate_during_training` (huggingface#8852)" This reverts commit 5530299. * check that pipeline.git.base_revision is defined before proceeding * Revert "Revert "Remove deprecated `evalutate_during_training` (huggingface#8852)"" This reverts commit dfec84d. * check that pipeline.git.base_revision is defined before proceeding * doc only * doc + code * restore * restore * typo
ratthachat · Dec 1, 2020 · 21db560 · 21db560
1 parent a947386
commit 21db560
Showing 1 changed file with 18 additions and 12 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -11,12 +11,18 @@ commands:
       - run:
           name: docs-only changes skip check
           command: |
-            if git diff --name-only << pipeline.git.base_revision >>...<< pipeline.git.revision >> | egrep -qv '\.(md|rst)$'
+            # pipeline.git.base_revision is not always defined, so only proceed if all external vars are defined
+            if test -n "<< pipeline.git.base_revision >>" && test -n "<< pipeline.git.revision >>"
             then
-                echo "Non-docs were modified in this PR, proceeding normally"
+                if git diff --name-only << pipeline.git.base_revision >>...<< pipeline.git.revision >> | egrep -qv '\.(md|rst)$'
+                then
+                    echo "Non-docs were modified in this PR, proceeding normally"
+                else
+                    echo "Only docs were modified in this PR, quitting this job"
+                    circleci step halt
+                fi
             else
-                echo "Only docs were modified in this PR, quitting this job"
-                circleci step halt
+                echo "Can't perform skipping check w/o base_revision defined, continuing the job"
             fi
 
 # TPU REFERENCES
@@ -88,7 +94,7 @@ jobs:
         parallelism: 1
         steps:
             - checkout
-            # - skip-job-on-doc-only-changes
+            - skip-job-on-doc-only-changes
             - restore_cache:
                   keys:
                       - v0.4-torch_and_tf-{{ checksum "setup.py" }}
@@ -115,7 +121,7 @@ jobs:
         parallelism: 1
         steps:
             - checkout
-            # - skip-job-on-doc-only-changes
+            - skip-job-on-doc-only-changes
             - restore_cache:
                   keys:
                       - v0.4-torch-{{ checksum "setup.py" }}
@@ -142,7 +148,7 @@ jobs:
         parallelism: 1
         steps:
             - checkout
-            # - skip-job-on-doc-only-changes
+            - skip-job-on-doc-only-changes
             - restore_cache:
                   keys:
                       - v0.4-tf-{{ checksum "setup.py" }}
@@ -169,7 +175,7 @@ jobs:
         parallelism: 1
         steps:
             - checkout
-            # - skip-job-on-doc-only-changes
+            - skip-job-on-doc-only-changes
             - restore_cache:
                 keys:
                     - v0.4-flax-{{ checksum "setup.py" }}
@@ -196,7 +202,7 @@ jobs:
         parallelism: 1
         steps:
             - checkout
-            # - skip-job-on-doc-only-changes
+            - skip-job-on-doc-only-changes
             - restore_cache:
                   keys:
                       - v0.4-torch-{{ checksum "setup.py" }}
@@ -223,7 +229,7 @@ jobs:
         parallelism: 1
         steps:
             - checkout
-            # - skip-job-on-doc-only-changes
+            - skip-job-on-doc-only-changes
             - restore_cache:
                   keys:
                       - v0.4-tf-{{ checksum "setup.py" }}
@@ -248,7 +254,7 @@ jobs:
             RUN_CUSTOM_TOKENIZERS: yes
         steps:
             - checkout
-            # - skip-job-on-doc-only-changes
+            - skip-job-on-doc-only-changes
             - restore_cache:
                   keys:
                       - v0.4-custom_tokenizers-{{ checksum "setup.py" }}
@@ -276,7 +282,7 @@ jobs:
         parallelism: 1
         steps:
             - checkout
-            # - skip-job-on-doc-only-changes
+            - skip-job-on-doc-only-changes
             - restore_cache:
                   keys:
                       - v0.4-torch_examples-{{ checksum "setup.py" }}