Skip to content

Commit df55131

Browse files
jparrillclaude
andcommitted
fix(deps): set default DEPS_UPSTREAM_BRANCH to release-4.20 for oadp-1.6
The dependency tests and update script were checking against the main branch of hypershift, but oadp-1.6 should track release-4.20 instead. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> Signed-off-by: Juan Manuel Parrilla Madrid <jparrill@redhat.com>
1 parent 679fa34 commit df55131

3 files changed

Lines changed: 6 additions & 6 deletions

File tree

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ VERSION ?= $(shell git describe --tags --always)
2121
ARCHS ?= amd64 arm64
2222
DOCKER_BUILD_ARGS ?= --platform=linux/$(ARCH)
2323
GO=GO111MODULE=on GOWORK=off GOFLAGS=-mod=vendor go
24-
DEPS_UPSTREAM_BRANCH ?= main
24+
DEPS_UPSTREAM_BRANCH ?= release-4.20
2525

2626
.PHONY: install-goreleaser
2727
install-goreleaser:

scripts/update-dependencies.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ var watchedDependencies = map[string]string{
2020
}
2121

2222
func main() {
23-
// Read the target upstream branch from environment variable, defaulting to "main"
23+
// Read the target upstream branch from environment variable, defaulting to "release-4.20"
2424
targetBranch := os.Getenv("DEPS_UPSTREAM_BRANCH")
2525
if targetBranch == "" {
26-
targetBranch = "main"
26+
targetBranch = "release-4.20"
2727
}
2828

2929
fmt.Printf("🔄 Updating watched dependencies to latest %s branch versions...\n", targetBranch)

tests/integration/dependencies/dependencies_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,18 @@ var watchedDependencies = []string{
2121
}
2222

2323
// getTargetBranch returns the upstream branch to check dependencies against.
24-
// It reads the DEPS_UPSTREAM_BRANCH environment variable, defaulting to "main".
24+
// It reads the DEPS_UPSTREAM_BRANCH environment variable, defaulting to "release-4.20".
2525
func getTargetBranch() string {
2626
branch := os.Getenv("DEPS_UPSTREAM_BRANCH")
2727
if branch == "" {
28-
branch = "main"
28+
branch = "release-4.20"
2929
}
3030
return branch
3131
}
3232

3333
// TestWatchedDependenciesAreUpToDate validates that all watched dependencies
3434
// are up-to-date with the latest versions available from the target upstream branch.
35-
// The target branch is controlled by the DEPS_UPSTREAM_BRANCH environment variable (default: "main").
35+
// The target branch is controlled by the DEPS_UPSTREAM_BRANCH environment variable (default: "release-4.20").
3636
// This helps prevent scheme-related issues and compatibility problems.
3737
func TestWatchedDependenciesAreUpToDate(t *testing.T) {
3838
targetBranch := getTargetBranch()

0 commit comments

Comments
 (0)