Fix BUSL license checker to skip >= 1.17.x target branches (#19152)

* Fix BUSL license checker to skip >= 1.17.x target branches * Update .github/scripts/license_checker.sh Co-authored-by: Nathan Coleman <[email protected]> --------- Co-authored-by: Nathan Coleman <[email protected]>
hashicorp · Oct 11, 2023 · 02bfe1d · 02bfe1d
1 parent c26d5cf
commit 02bfe1d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 13 deletions.
diff --git a/.github/scripts/license_checker.sh b/.github/scripts/license_checker.sh
@@ -2,15 +2,19 @@
 # Copyright (c) HashiCorp, Inc.
 # SPDX-License-Identifier: BUSL-1.1
 
+if [[ ${GITHUB_BASE_REF} == release/1.14.* ]] || [[ ${GITHUB_BASE_REF} == release/1.15.* ]] || [[ ${GITHUB_BASE_REF} == release/1.16.* ]]; then
+    busl_files=$(grep -r 'SPDX-License-Identifier: BUSL' . --exclude-dir .github)
 
-busl_files=$(grep -r 'SPDX-License-Identifier: BUSL' . --exclude-dir .github)
-
-# If we do not find a file in .changelog/, we fail the check
-if [ -n "$busl_files" ]; then
-    echo "Found BUSL occurrences in the PR branch! (See NET-5258 for details)"
-    echo -n "$busl_files"
-    exit 1
+    if [ -n "$busl_files" ]; then
+        echo "Found BUSL occurrences in the PR branch! (See NET-5258 for details)"
+        echo -n "$busl_files"
+        exit 1
+    else
+        echo "Did not find any occurrences of BUSL in the PR branch"
+        exit 0
+    fi
+    echo "The variable starts with release/1.14, release/1.15, or release/1.17."
 else
-    echo "Did not find any occurrences of BUSL in the PR branch"
+    echo "Skipping BUSL check since ${GITHUB_BASE_REF} not one of release/1.14.*, release/1.15.*, or release/1.16.*."
     exit 0
-fi
+fi
diff --git a/.github/workflows/license-checker.yml b/.github/workflows/license-checker.yml
@@ -7,11 +7,8 @@ name: License Checker
 
 on:
   pull_request:
+    # Logic to only apply check 1.1[4,5,6].x branches is in license_checker.sh
     types: [opened, synchronize]
-    branches:
-      - release/1.14.*
-      - release/1.15.*
-      - release/1.16.*
 
 jobs:
   # checks that the diff does not contain any reference to