Merge branch 'main' into acc/fix-run-local

Author: andrewnester

internal/testarchive/archive.go

@@ -107,11 +107,14 @@ func createArchive(archiveDir, binDir, repoRoot string) error {
 	// the CPU architecture to keep the door open for future optimizations.
 	downloaders := []downloader{
 		goDownloader{arch: "amd64", binDir: binDir},
-		goDownloader{arch: "arm64", binDir: binDir},
 		uvDownloader{arch: "amd64", binDir: binDir},
-		uvDownloader{arch: "arm64", binDir: binDir},
 		jqDownloader{arch: "amd64", binDir: binDir},
-		jqDownloader{arch: "arm64", binDir: binDir},
+
+		// TODO: Serverless clusters do not support arm64 yet.
+		// Enable ARM64 once serverless clusters support it.
+		// goDownloader{arch: "arm64", binDir: binDir},
+		// uvDownloader{arch: "arm64", binDir: binDir},
+		// jqDownloader{arch: "arm64", binDir: binDir},
 	}
 
 	for _, downloader := range downloaders {

internal/testarchive/archive_test.go

@@ -1,5 +1,3 @@
-//go:build dbr_only
-
 package main
 
 import (
@@ -11,6 +9,12 @@ import (
 )
 
 func TestArchive(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping test in short mode")
+	}
+
+	t.Parallel()
+
 	archiveDir := t.TempDir()
 	binDir := t.TempDir()
 	repoRoot := "../.."
@@ -24,13 +28,16 @@ func TestArchive(t *testing.T) {
 
 	// Go installation is a directory because it includes the
 	// standard library source code along with the Go binary.
-	assert.FileExists(t, filepath.Join(assertDir, "bin", "arm64", "go", "bin", "go"))
 	assert.FileExists(t, filepath.Join(assertDir, "bin", "amd64", "go", "bin", "go"))
-	assert.FileExists(t, filepath.Join(assertDir, "bin", "arm64", "uv"))
 	assert.FileExists(t, filepath.Join(assertDir, "bin", "amd64", "uv"))
-	assert.FileExists(t, filepath.Join(assertDir, "bin", "arm64", "jq"))
 	assert.FileExists(t, filepath.Join(assertDir, "bin", "amd64", "jq"))
 
+	// TODO: Serverless clusters do not support arm64 yet.
+	// Assert these files exist after we support arm64.
+	assert.NoFileExists(t, filepath.Join(assertDir, "bin", "arm64", "go", "bin", "go"))
+	assert.NoFileExists(t, filepath.Join(assertDir, "bin", "arm64", "uv"))
+	assert.NoFileExists(t, filepath.Join(assertDir, "bin", "arm64", "jq"))
+
 	assert.FileExists(t, filepath.Join(assertDir, "cli", "go.mod"))
 	assert.FileExists(t, filepath.Join(assertDir, "cli", "go.sum"))
 }

internal/testarchive/downloader_test.go

@@ -1,5 +1,3 @@
-//go:build dbr_only
-
 package main
 
 import (
@@ -12,6 +10,12 @@ import (
 )
 
 func TestUvDownloader(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping test in short mode")
+	}
+
+	t.Parallel()
+
 	tmpDir := t.TempDir()
 
 	for _, arch := range []string{"arm64", "amd64"} {
@@ -27,6 +31,12 @@ func TestUvDownloader(t *testing.T) {
 }
 
 func TestJqDownloader(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping test in short mode")
+	}
+
+	t.Parallel()
+
 	tmpDir := t.TempDir()
 
 	for _, arch := range []string{"arm64", "amd64"} {
@@ -42,6 +52,12 @@ func TestJqDownloader(t *testing.T) {
 }
 
 func TestGoDownloader(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping test in short mode")
+	}
+
+	t.Parallel()
+
 	tmpDir := t.TempDir()
 
 	for _, arch := range []string{"arm64", "amd64"} {