From 94a423d2527b4d7f02180e68f1e7d622f847e0b0 Mon Sep 17 00:00:00 2001
From: Piotr Findeisen <piotr.findeisen@gmail.com>
Date: Fri, 28 Jun 2024 12:30:13 +0200
Subject: [PATCH] Fix CI script inclusion of release branches (#10514)

The CI scripts are meant to run on release maintenance branches such as
1.5.x. They were run for releases up to 1.0 because of the `0.*` pattern

This commit:

- includes `1.*` branches (but that's likely needs to be propagated to
  existing branches)
- includes `2.*` branches foreseeing imminent 2.0 release
- changes the `0.**` pattern to `0.*`. Multiple asterisks are needed to
  match branch names including `/` but release branche naming convention
  do not expect such branch names.
---
 .github/workflows/api-binary-compatibility.yml | 4 +++-
 .github/workflows/delta-conversion-ci.yml      | 4 +++-
 .github/workflows/flink-ci.yml                 | 4 +++-
 .github/workflows/hive-ci.yml                  | 4 +++-
 .github/workflows/java-ci.yml                  | 4 +++-
 .github/workflows/open-api.yml                 | 4 +++-
 .github/workflows/spark-ci.yml                 | 4 +++-
 7 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/api-binary-compatibility.yml b/.github/workflows/api-binary-compatibility.yml
index 80dc0da8856c..fbdb740e6e72 100644
--- a/.github/workflows/api-binary-compatibility.yml
+++ b/.github/workflows/api-binary-compatibility.yml
@@ -22,7 +22,9 @@ on:
   push:
     branches:
       - 'main'
-      - '0.**'
+      - '0.*'
+      - '1.*'
+      - '2.*'
     tags:
       - 'apache-iceberg-**'
   pull_request:
diff --git a/.github/workflows/delta-conversion-ci.yml b/.github/workflows/delta-conversion-ci.yml
index c89fbb6060af..90c1ad4109fd 100644
--- a/.github/workflows/delta-conversion-ci.yml
+++ b/.github/workflows/delta-conversion-ci.yml
@@ -22,7 +22,9 @@ on:
   push:
     branches:
       - 'main'
-      - '0.**'
+      - '0.*'
+      - '1.*'
+      - '2.*'
     tags:
       - 'apache-iceberg-**'
   pull_request:
diff --git a/.github/workflows/flink-ci.yml b/.github/workflows/flink-ci.yml
index e360e0f2934b..b74cbcc84291 100644
--- a/.github/workflows/flink-ci.yml
+++ b/.github/workflows/flink-ci.yml
@@ -22,7 +22,9 @@ on:
   push:
     branches:
     - 'main'
-    - '0.**'
+    - '0.*'
+    - '1.*'
+    - '2.*'
     tags:
     - 'apache-iceberg-**'
   pull_request:
diff --git a/.github/workflows/hive-ci.yml b/.github/workflows/hive-ci.yml
index cd201a09d0fa..6e97e2164758 100644
--- a/.github/workflows/hive-ci.yml
+++ b/.github/workflows/hive-ci.yml
@@ -22,7 +22,9 @@ on:
   push:
     branches:
     - 'main'
-    - '0.**'
+    - '0.*'
+    - '1.*'
+    - '2.*'
     tags:
     - 'apache-iceberg-**'
   pull_request:
diff --git a/.github/workflows/java-ci.yml b/.github/workflows/java-ci.yml
index 22cc60d2262e..083ae2f5fe36 100644
--- a/.github/workflows/java-ci.yml
+++ b/.github/workflows/java-ci.yml
@@ -22,7 +22,9 @@ on:
   push:
     branches:
     - 'main'
-    - '0.**'
+    - '0.*'
+    - '1.*'
+    - '2.*'
     tags:
     - 'apache-iceberg-**'
   pull_request:
diff --git a/.github/workflows/open-api.yml b/.github/workflows/open-api.yml
index 397d1bf30e4a..40aefc989244 100644
--- a/.github/workflows/open-api.yml
+++ b/.github/workflows/open-api.yml
@@ -22,7 +22,9 @@ on:
   push:
     branches:
       - 'main'
-      - '0.**'
+      - '0.*'
+      - '1.*'
+      - '2.*'
     tags:
       - 'apache-iceberg-**'
   pull_request:
diff --git a/.github/workflows/spark-ci.yml b/.github/workflows/spark-ci.yml
index 5ddff7a506dd..d923cf860f1d 100644
--- a/.github/workflows/spark-ci.yml
+++ b/.github/workflows/spark-ci.yml
@@ -22,7 +22,9 @@ on:
   push:
     branches:
     - 'main'
-    - '0.**'
+    - '0.*'
+    - '1.*'
+    - '2.*'
     tags:
     - 'apache-iceberg-**'
   pull_request: