chore(.github): unify workflows between master and branch-** (#4152)

scylladb · Dec 11, 2024 · bea0205 · bea0205
1 parent 6f6a5a9
commit bea0205
Show file tree

Hide file tree

Showing 14 changed files with 36 additions and 17 deletions.
diff --git a/.github/cfg/integration-test-core.yaml b/.github/cfg/integration-test-core.yaml
@@ -1,7 +1,8 @@
 on:
   push:
     branches:
-      - branch-3.4
+      - master
+      - 'branch-**'
   pull_request:
     types: [ opened, synchronize, reopened ]
 

diff --git a/.github/cfg/main.go b/.github/cfg/main.go
@@ -39,7 +39,8 @@ func (cfg integrationTestCfg) scyllaVersion() string {
 // This is a simple script used to generate workflow files by applying
 // each config from './integration-test-cfg.yaml' onto './integration-test-core.yaml'.
 // It also prints github badges syntax that can be pasted into the README.md file.
-// It has to be run from the same dir with 'go run main.go' command.
+// It has to be run from the same dir with 'go run main.go <badge-branch>' command.
+// The <badge-branch> ('master' by default) arg specifies the branch from which the badges are generated.
 func main() {
 	f, err := os.ReadFile("./integration-test-cfg.yaml")
 	if err != nil {
@@ -74,6 +75,12 @@ func main() {
 		}
 	}
 
+	// Select badge branch
+	branch := "master"
+	if len(os.Args) == 2 {
+		branch = os.Args[1]
+	}
+
 	fmt.Println("Reference links to badges")
 	versionBadges := make(map[string][]string)
 	for _, cfg := range configs {
@@ -90,8 +97,8 @@ func main() {
 		}
 
 		versionBadges[v] = append(versionBadges[v], "!["+name+"]")
-		fmt.Printf("[%s]: https://github.com/scylladb/scylla-manager/actions/workflows/%s.yaml/badge.svg?branch=master\n",
-			name, name)
+		fmt.Printf("[%s]: https://github.com/scylladb/scylla-manager/actions/workflows/%s.yaml/badge.svg?branch=%s\n",
+			name, name, branch)
 	}
 
 	fmt.Println("Badges formatted as table")

diff --git a/.github/workflows/integration-tests-2023.1.11-IPV4-raftschema.yaml b/.github/workflows/integration-tests-2023.1.11-IPV4-raftschema.yaml
@@ -108,4 +108,5 @@ name: integration-tests-2023.1.11-IPV4-raftschema
             - reopened
     push:
         branches:
-            - branch-3.4
+            - master
+            - branch-**
diff --git a/.github/workflows/integration-tests-2023.1.11-IPV4.yaml b/.github/workflows/integration-tests-2023.1.11-IPV4.yaml
@@ -108,4 +108,5 @@ name: integration-tests-2023.1.11-IPV4
             - reopened
     push:
         branches:
-            - branch-3.4
+            - master
+            - branch-**
diff --git a/.github/workflows/integration-tests-2023.1.11-IPV6-raftschema.yaml b/.github/workflows/integration-tests-2023.1.11-IPV6-raftschema.yaml
@@ -108,4 +108,5 @@ name: integration-tests-2023.1.11-IPV6-raftschema
             - reopened
     push:
         branches:
-            - branch-3.4
+            - master
+            - branch-**
diff --git a/.github/workflows/integration-tests-2024.1.9-IPV4.yaml b/.github/workflows/integration-tests-2024.1.9-IPV4.yaml
@@ -108,4 +108,5 @@ name: integration-tests-2024.1.9-IPV4
             - reopened
     push:
         branches:
-            - branch-3.4
+            - master
+            - branch-**
diff --git a/.github/workflows/integration-tests-2024.1.9-IPV6.yaml b/.github/workflows/integration-tests-2024.1.9-IPV6.yaml
@@ -108,4 +108,5 @@ name: integration-tests-2024.1.9-IPV6
             - reopened
     push:
         branches:
-            - branch-3.4
+            - master
+            - branch-**
diff --git a/.github/workflows/integration-tests-6.1.1-IPV4-tablets.yaml b/.github/workflows/integration-tests-6.1.1-IPV4-tablets.yaml
@@ -108,4 +108,5 @@ name: integration-tests-6.1.1-IPV4-tablets
             - reopened
     push:
         branches:
-            - branch-3.4
+            - master
+            - branch-**
diff --git a/.github/workflows/integration-tests-6.1.1-IPV4.yaml b/.github/workflows/integration-tests-6.1.1-IPV4.yaml
@@ -108,4 +108,5 @@ name: integration-tests-6.1.1-IPV4
             - reopened
     push:
         branches:
-            - branch-3.4
+            - master
+            - branch-**
diff --git a/.github/workflows/integration-tests-6.1.1-IPV6-tablets.yaml b/.github/workflows/integration-tests-6.1.1-IPV6-tablets.yaml
@@ -108,4 +108,5 @@ name: integration-tests-6.1.1-IPV6-tablets
             - reopened
     push:
         branches:
-            - branch-3.4
+            - master
+            - branch-**
diff --git a/.github/workflows/integration-tests-latest-enterprise-IPV4-tablets.yaml b/.github/workflows/integration-tests-latest-enterprise-IPV4-tablets.yaml
@@ -108,4 +108,5 @@ name: integration-tests-latest-enterprise-IPV4-tablets
             - reopened
     push:
         branches:
-            - branch-3.4
+            - master
+            - branch-**
diff --git a/.github/workflows/integration-tests-latest-enterprise-IPV4.yaml b/.github/workflows/integration-tests-latest-enterprise-IPV4.yaml
@@ -108,4 +108,5 @@ name: integration-tests-latest-enterprise-IPV4
             - reopened
     push:
         branches:
-            - branch-3.4
+            - master
+            - branch-**
diff --git a/.github/workflows/sanity-checks.yml b/.github/workflows/sanity-checks.yml
@@ -3,7 +3,8 @@ name: Sanity check
 on:
   push:
     branches:
-      - branch-3.4
+      - master
+      - 'branch-**'
   pull_request:
     types: [ opened, synchronize, reopened ]
 

diff --git a/README.md b/README.md
@@ -22,11 +22,11 @@ Scylla Manager consists of tree components:
 | **6.1.1**             | ![integration-tests-6.1.1-IPV4]<br/>![integration-tests-6.1.1-IPV4-tablets]<br/>![integration-tests-6.1.1-IPV6-tablets]                   | Restoration of **Authentication** and **Service Levels** is not supported<br/>Restoration of schema containing **Alternator** tables is not supported |
 | **latest-enterprise** | ![integration-tests-latest-enterprise-IPV4]<br/>![integration-tests-latest-enterprise-IPV4-tablets]                                       | Restoration of **Authentication** and **Service Levels** is not supported<br/>Restoration of schema containing **Alternator** tables is not supported |
 
-[integration-tests-2024.1.9-IPV4]: https://github.com/scylladb/scylla-manager/actions/workflows/integration-tests-2024.1.9-IPV4.yaml/badge.svg?branch=branch-3.4
-[integration-tests-2024.1.9-IPV6]: https://github.com/scylladb/scylla-manager/actions/workflows/integration-tests-2024.1.9-IPV6.yaml/badge.svg?branch=branch-3.4
 [integration-tests-2023.1.11-IPV4]: https://github.com/scylladb/scylla-manager/actions/workflows/integration-tests-2023.1.11-IPV4.yaml/badge.svg?branch=branch-3.4
 [integration-tests-2023.1.11-IPV4-raftschema]: https://github.com/scylladb/scylla-manager/actions/workflows/integration-tests-2023.1.11-IPV4-raftschema.yaml/badge.svg?branch=branch-3.4
 [integration-tests-2023.1.11-IPV6-raftschema]: https://github.com/scylladb/scylla-manager/actions/workflows/integration-tests-2023.1.11-IPV6-raftschema.yaml/badge.svg?branch=branch-3.4
+[integration-tests-2024.1.9-IPV4]: https://github.com/scylladb/scylla-manager/actions/workflows/integration-tests-2024.1.9-IPV4.yaml/badge.svg?branch=branch-3.4
+[integration-tests-2024.1.9-IPV6]: https://github.com/scylladb/scylla-manager/actions/workflows/integration-tests-2024.1.9-IPV6.yaml/badge.svg?branch=branch-3.4
 [integration-tests-6.1.1-IPV4]: https://github.com/scylladb/scylla-manager/actions/workflows/integration-tests-6.1.1-IPV4.yaml/badge.svg?branch=branch-3.4
 [integration-tests-6.1.1-IPV4-tablets]: https://github.com/scylladb/scylla-manager/actions/workflows/integration-tests-6.1.1-IPV4-tablets.yaml/badge.svg?branch=branch-3.4
 [integration-tests-6.1.1-IPV6-tablets]: https://github.com/scylladb/scylla-manager/actions/workflows/integration-tests-6.1.1-IPV6-tablets.yaml/badge.svg?branch=branch-3.4