From 401e6f2309897e9ac2263755a97417b3e280bc26 Mon Sep 17 00:00:00 2001
From: Martin Holst Swende <martin@swende.se>
Date: Mon, 30 Sep 2024 12:31:09 +0200
Subject: [PATCH] enable it

---
 .travis.yml | 22 ++--------------------
 build/ci.go | 10 +++++++---
 2 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3c639d40f9..761f6a87b0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,8 +9,7 @@ jobs:
         - azure-osx
 
   include:
-    # These builders create the Docker sub-images for multi-arch push and each
-    # will attempt to push the multi-arch image if they are the last builder
+    # This builder create and push the Docker images for all architectures
     - stage: build
       if: type = push
       os: linux
@@ -26,24 +25,7 @@ jobs:
       before_install:
         - export DOCKER_CLI_EXPERIMENTAL=enabled
       script:
-        - go run build/ci.go docker -image -manifest amd64,arm64 -upload ethereum/client-go
-
-    - stage: build
-      if: type = push
-      os: linux
-      arch: arm64
-      dist: focal
-      go: 1.23.x
-      env:
-        - docker
-      services:
-        - docker
-      git:
-        submodules: false # avoid cloning ethereum/tests
-      before_install:
-        - export DOCKER_CLI_EXPERIMENTAL=enabled
-      script:
-        - go run build/ci.go docker -image -manifest amd64,arm64 -upload ethereum/client-go
+        - go run build/ci.go dockerx -manifest amd64,arm64 -upload ethereum/client-gox
 
     # This builder does the Linux Azure uploads
     - stage: build
diff --git a/build/ci.go b/build/ci.go
index 42e60360f5..3cba0319e2 100644
--- a/build/ci.go
+++ b/build/ci.go
@@ -718,6 +718,10 @@ func maybeSkipArchive(env build.Environment) {
 		log.Printf("skipping archive creation because this is a PR build")
 		os.Exit(0)
 	}
+	if env.Branch == "buildx" {
+		// Temporarily allow this
+		return
+	}
 	if env.Branch != "master" && !strings.HasPrefix(env.Tag, "v1.") {
 		log.Printf("skipping archive creation because branch %q, tag %q is not on the inclusion list", env.Branch, env.Tag)
 		os.Exit(0)
@@ -923,7 +927,7 @@ func doDockerBuildx(cmdline []string) {
 	var tags []string
 
 	switch {
-	case env.Branch == "master":
+	case env.Branch == "master" || env.Branch == "buildx":
 		tags = []string{"latest"}
 	case strings.HasPrefix(env.Tag, "v1."):
 		tags = []string{"stable", fmt.Sprintf("release-1.%d", params.VersionMinor), "v" + params.Version}
@@ -938,7 +942,7 @@ func doDockerBuildx(cmdline []string) {
 	} {
 		var subImages []string
 		for _, tag := range tags { // latest, stable etc
-			gethImage :=  fmt.Sprintf("%s%s", spec.base, tag)
+			gethImage := fmt.Sprintf("%s%s", spec.base, tag)
 			for _, arch := range strings.Split(*manifest, ",") { //amd64. arm64
 				subImage := fmt.Sprintf("%s-%s", gethImage, arch)
 				build.MustRunCommand("docker", "buildx",
@@ -950,7 +954,7 @@ func doDockerBuildx(cmdline []string) {
 					"--file", spec.file, ".")
 				subImages = append(subImages, subImage)
 			}
-			build.MustRunCommand("docker", append([]string{ "buildx", "imagetools", "create","--tag", gethImage}, subImages...)...)
+			build.MustRunCommand("docker", append([]string{"buildx", "imagetools", "create", "--tag", gethImage}, subImages...)...)
 		}
 	}
 }