Merge branch 'main' into watcher-examples

Author: lcawl

.github/workflows/check-backport-labels.yml

@@ -48,8 +48,8 @@ jobs:
 
           echo "::endgroup::"
 
+          has_backport_label=false
           has_skip_backport_label=false
-          has_exact_backport_label=false
           declare -A pr_exact_majors=()
           declare -A pr_floating_majors=()
 
@@ -66,12 +66,13 @@ jobs:
               continue
             fi
 
+            has_backport_label=true
+
             if [[ "${pr_label}" =~ ${backport_regex} ]]; then
               major="${BASH_REMATCH[1]}"
               minor="${BASH_REMATCH[2]}"
               if [ "${minor}" != "x" ]; then
                 pr_exact_majors["${major}"]=1
-                has_exact_backport_label=true
               else
                 pr_floating_majors["${major}"]=1
               fi
@@ -82,15 +83,15 @@ jobs:
 
           echo "::endgroup::"
 
-          if [ "${has_skip_backport_label}" = true ] && [ "${has_exact_backport_label}" = true ]; then
+          if [ "${has_skip_backport_label}" = true ] && [ "${has_backport_label}" = true ]; then
             echo "::error::The 'skip-backport' not be used in combination with another backport"\
                   "label."
             exit 1
           fi
 
-          if [ "${has_skip_backport_label}" != true ] && [ "${has_exact_backport_label}" != true ]; then
-            echo "::error::No exact backport label found. Please add at least one of the"\
-                  "'backport {major}.{minor}' labels or use 'skip-backport',"\
+          if [ "${has_skip_backport_label}" != true ] && [ "${has_backport_label}" != true ]; then
+            echo "::error::No backport label found. Please add at least one of the"\
+                  "'backport {major}.{minor|x}' labels or use 'skip-backport',"\
                   "if this PR should not be backported."
             exit 1
           fi
@@ -115,19 +116,3 @@ jobs:
           if [ "${has_required_floating_labels}" != true ]; then
             exit 1
           fi
-
-          # Validate that an exact backport label exists for each floating backport label major
-          # version.
-
-          has_required_exact_labels=true
-
-          for pr_floating_major in "${!pr_floating_majors[@]}"; do
-            if [ -z "${pr_exact_majors[${pr_floating_major}]}" ]; then
-              has_required_exact_labels=false
-              echo "::error::Missing exact backport label for '${pr_floating_major}.x'"
-            fi
-          done
-
-          if [ "${has_required_exact_labels}" != true ]; then
-            exit 1
-          fi