Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Stop updating Bazel version in builds #1689

Merged
merged 1 commit into from
Jan 31, 2025
Merged

Stop updating Bazel version in builds #1689

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .github/docker/Dockerfile.bazel
View file
Open in desktop

This file was deleted.

15 changes: 1 addition & 14 deletions internal/cmd/fetcher/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import (
"os"
"os/exec"
"path/filepath"
"regexp"
"strings"
"time"

Expand All @@ -24,8 +23,6 @@ import (
)

var (
bazelDownloadRegexp = regexp.MustCompile(`bazelbuild/bazel/releases/download/[^/]+/bazel-[^-]+-linux`)
bazelImageName = "gcr.io/bazel-public/bazel"
dockerfileImageName = "docker/dockerfile"
dockerfileSyntaxPrefix = "# syntax=docker/dockerfile:"
errNoVersions = errors.New("no versions found")
Expand Down Expand Up @@ -303,23 +300,13 @@ func copyFile(
isDockerfile := strings.HasPrefix(filename, "Dockerfile")
prevVersion = strings.TrimPrefix(prevVersion, "v")
newVersion = strings.TrimPrefix(newVersion, "v")
latestBazelVersion := latestBaseImages.ImageVersion(bazelImageName)
if latestBazelVersion == "" {
return fmt.Errorf("failed to find latest version for bazel image %q", bazelImageName)
}
latestDockerfileVersion := latestBaseImages.ImageVersion(dockerfileImageName)
if latestDockerfileVersion == "" {
return fmt.Errorf("failed to find latest version for dockerfile image %q", bazelImageName)
return fmt.Errorf("failed to find latest version for dockerfile image %q", dockerfileImageName)
}
s := bufio.NewScanner(srcFile)
for s.Scan() {
line := strings.ReplaceAll(s.Text(), prevVersion, newVersion)
line = bazelDownloadRegexp.ReplaceAllString(
line,
fmt.Sprintf(`bazelbuild/bazel/releases/download/%[1]s/bazel-%[1]s-linux`,
latestBazelVersion,
),
)
if isDockerfile && len(line) > 5 && strings.EqualFold(line[0:5], "from ") {
// Replace FROM line with the latest base image (if found)
fields := strings.Fields(line)
Expand Down
3 changes: 0 additions & 3 deletions internal/docker/baseimage_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,6 @@ func TestBaseImages(t *testing.T) {
assert.NotEmpty(t, baseImages)
assert.NotEmpty(t, baseImages.ImageNameAndVersion("debian"))
assert.Empty(t, baseImages.ImageNameAndVersion("untracked"))
// Test just returning version
assert.NotEmpty(t, baseImages.ImageVersion("gcr.io/bazel-public/bazel"))
assert.NotContains(t, baseImages.ImageVersion("gcr.io/bazel-public/bazel"), "bazel:")
// Test distroless image upgrades
javaImage := baseImages.ImageNameAndVersion("gcr.io/distroless/java11-debian11")
assert.NotEmpty(t, javaImage)
Expand Down