Skip to content
Prev Previous commit
Next Next commit
Sync CI configuration with main branch
  • Loading branch information
mrodm committed Aug 5, 2026
commit bf345ae32e80d86ab25ccaaf48752728c887ee3f
6 changes: 3 additions & 3 deletions .buildkite/scripts/backport_branch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -184,10 +184,10 @@ updateBackportBranchContents() {
git checkout "$SOURCE_BRANCH" -- "magefile.go"
git add magefile.go

# magefile_main_only.go contains targets that depend on go-gh/v2 and are never
# magefile_daily_jobs.go contains targets that depend on go-gh/v2 and are never
# called on backport branches. Exclude it so the dependency is fully dropped.
echo "--- Removing magefile_main_only.go (not needed on backport branches)..."
git rm --force magefile_main_only.go 2>/dev/null || rm -f magefile_main_only.go
echo "--- Removing magefile_daily_jobs.go (not needed on backport branches)..."
git rm --force magefile_daily_jobs.go 2>/dev/null || rm -f magefile_daily_jobs.go

# Restore workflows from the main branch since modifying them requires extra permissions.
# > error: GH013: Repository rule violations found for ...
Expand Down
2 changes: 2 additions & 0 deletions .buildkite/scripts/non_package_patterns.txt
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@
^catalog-info\.yaml
^cmd/backport/
^dev/codeowners/
^dev/packagenames/
^magefile_daily_jobs\.go
^dev/gitutil/
^dev/requiresupdate/
^dev/scripts/
Expand Down
4 changes: 3 additions & 1 deletion .buildkite/scripts/test_non_package_patterns.sh
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,10 @@ NON_PACKAGE_PATHS=(
".gitignore"
".mergify.yml"
"catalog-info.yaml"
"dev/backports/some_script.sh"
"cmd/backport/backports/apply/apply.go"
"magefile_daily_jobs.go"
"dev/codeowners/codeowners.go"
"dev/packagenames/packagenames.go"
"dev/gitutil/git.go"
"dev/requiresupdate/requiresupdate.go"
"dev/scripts/foo.sh"
Expand Down
Loading