From f8cf1b50fc2da9e6cc736e969745840d74015471 Mon Sep 17 00:00:00 2001 From: Tom Lebreux Date: Fri, 20 Dec 2024 13:18:20 -0500 Subject: [PATCH] Update branches for CI (#493) --- .github/renovate.json | 2 +- .github/workflows/ci.yaml | 4 ++-- .github/workflows/lint.yaml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/renovate.json b/.github/renovate.json index 8a78cb26..b0e45a81 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -3,7 +3,7 @@ "github>rancher/renovate-config#release" ], "baseBranches": [ - "master", + "main", "release-2.1", "release-2.0-untagged" ], diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 095c7a17..f5f32025 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -6,8 +6,8 @@ on: tags: - v* branches: - - 'release-*' - - 'master' + - 'release/*' + - 'main' jobs: ci: diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index 313c39bb..ed4e4eff 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -10,7 +10,7 @@ on: - v* branches: - 'release/*' - - 'master' + - 'main' jobs: golangci: