fix daily snapshot for 2.x (#18123)

ci/macOS.yml

@@ -15,8 +15,9 @@ jobs:
   pool:
     name: macOS-pool
     demands: assignment -equals ${{parameters.assignment}}
-  condition: or(eq('${{parameters.name}}', 'macos'),
-                eq(variables['Build.SourceBranchName'], 'main'))
+  condition: and(succeeded(),
+                 or(eq('${{parameters.name}}', 'macos'),
+                    eq(variables['Build.SourceBranchName'], 'main')))
   variables:
     - name: release_sha
       value: $[ dependencies.check_for_release.outputs['out.release_sha'] ]

release.sh

@@ -102,7 +102,7 @@ fi
 
 commit_belongs_to_release_branch() {
     git branch --all --format='%(refname:short)' --contains="$1" \
-      | grep -q -E '^origin/(main$|release/)'
+      | grep -q -E '^origin/(main$|main-2\.x$|release/)'
 }
 
 case $1 in