From e2aa7529c472df52fa95d521004838bb355f0c7e Mon Sep 17 00:00:00 2001
From: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com>
Date: Thu, 4 Apr 2024 21:37:05 -0400
Subject: [PATCH] CI: Simplify CircleCI always running --check-urls-reachable

---
 .circleci/config.yml | 42 +-----------------------------------------
 1 file changed, 1 insertion(+), 41 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d283fe0af..d48d60ae3 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -19,46 +19,7 @@ jobs:
           name: Check description files
           command: |
             pip install joblib retry
-            python ./scripts/check_description_files.py --check-dependencies . $(find . -maxdepth 1 -name "*.s4ext")
-
-  check-new-description-files:
-    docker:
-      - image: cimg/python:3.10
-    steps:
-      - checkout
-      - run:
-          name: Lookup base branch (Workaround the lack of CIRCLE_BASE_BRANCH env. variable)
-          # See https://discuss.circleci.com/t/how-to-get-the-pull-request-upstream-branch/5496/2
-          command: |
-            if [[ $CIRCLE_PULL_REQUEST != "" ]]; then
-              for base_branch in origin/main $(git branch -r | grep -E "origin\/[0-9](\.[0-9])+" | sort -r); do
-                differences=$(git diff $base_branch --name-only)
-                if [[ $differences != "" ]]; then
-                  break
-                fi
-              done
-            else
-              base_branch=$CIRCLE_BRANCH
-            fi
-            echo "export BASE_BRANCH=\"$base_branch\"" >> $BASH_ENV
-      - run:
-          name: Check new description files
-          command: |
-            # ignore grep exit code if no description files were added
-            set +e
-
-            echo "BASE_BRANCH is [$BASE_BRANCH]"
-            echo "CIRCLE_BRANCH is [$CIRCLE_BRANCH]"
-
-            # Collect list of new *.s4ext files
-            added=$(git diff $BASE_BRANCH --diff-filter=A --name-only | grep -E "^[^\/]+\.s4ext$")
-            echo "added [$added]"
-
-            # Run checks
-            if [[ $added != "" ]]; then
-              pip install joblib retry
-              python ./scripts/check_description_files.py --check-urls-reachable $added
-            fi
+            python ./scripts/check_description_files.py --check-urls-reachable --check-dependencies . $(find . -maxdepth 1 -name "*.s4ext")
 
 workflows:
   version: 2
@@ -66,4 +27,3 @@ workflows:
     jobs:
       - check-filenames
       - check-description-files
-      - check-new-description-files