From 383150e773f77d391df9b03281e6938cefa6accc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Leszczy=C5=84ski?= <2000michal@wp.pl> Date: Tue, 10 Dec 2024 14:39:55 +0100 Subject: [PATCH] chore(.github): unify workflows between master and branch-** --- .github/cfg/integration-test-core.yaml | 3 ++- .github/cfg/main.go | 13 ++++++++++--- ...integration-tests-2023.1.11-IPV4-raftschema.yaml | 3 ++- .../workflows/integration-tests-2023.1.11-IPV4.yaml | 3 ++- ...integration-tests-2023.1.11-IPV6-raftschema.yaml | 3 ++- .../workflows/integration-tests-2024.1.9-IPV4.yaml | 3 ++- .../workflows/integration-tests-2024.1.9-IPV6.yaml | 3 ++- .../integration-tests-6.1.1-IPV4-tablets.yaml | 3 ++- .github/workflows/integration-tests-6.1.1-IPV4.yaml | 3 ++- .../integration-tests-6.1.1-IPV6-tablets.yaml | 3 ++- ...ration-tests-latest-enterprise-IPV4-tablets.yaml | 3 ++- .../integration-tests-latest-enterprise-IPV4.yaml | 3 ++- .github/workflows/sanity-checks.yml | 3 ++- README.md | 4 ++-- 14 files changed, 36 insertions(+), 17 deletions(-) diff --git a/.github/cfg/integration-test-core.yaml b/.github/cfg/integration-test-core.yaml index cd3e1e4b2..fc8130cd1 100644 --- 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 index 96c002841..7f5f15ff5 100644 --- 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 ' command. +// The ('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 index 30df95b35..d0dfb67fc 100644 --- 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 index 1c4cfe2ce..d91e55375 100644 --- 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 index 6aa00a5a4..cb172c7e2 100644 --- 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 index 87393ecf2..95992a431 100644 --- 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 index c94f86f49..7c79318f5 100644 --- 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 index a3108c0d5..3171f5f19 100644 --- 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 index 3d94f6eb0..a4adb751b 100644 --- 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 index a250a4747..b2af1d480 100644 --- 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 index bff823e99..7d5316c83 100644 --- 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 index 8c665c84e..8299cc1dd 100644 --- 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 index 89df45038..958c541be 100644 --- 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 index 2c90e92cf..176ba6b9e 100644 --- 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]
![integration-tests-6.1.1-IPV4-tablets]
![integration-tests-6.1.1-IPV6-tablets] | Restoration of **Authentication** and **Service Levels** is not supported
Restoration of schema containing **Alternator** tables is not supported | | **latest-enterprise** | ![integration-tests-latest-enterprise-IPV4]
![integration-tests-latest-enterprise-IPV4-tablets] | Restoration of **Authentication** and **Service Levels** is not supported
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