ci: fix GoReleaser arm64 template details

Currently the arm64 Docker image contains the amd64 build which is clearly wrong. Also upgrade to using GoReleaser v1.1.0. Signed-off-by: Paul Jolly <paul@myitcv.io> Change-Id: I347cff60175227ed5f3375b3863dcf0302f21d80 Reviewed-on: https://review.gerrithub.io/c/cue-lang/cue/+/528605 Unity-Result: CUEcueckoo <cueckoo@cuelang.org> TryBot-Result: CUEcueckoo <cueckoo@cuelang.org>
LeonardAukea · Dec 2, 2021 · 795719e · 795719e
1 parent b68f4c3
commit 795719e
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 18 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -35,6 +35,6 @@ jobs:
         uses: goreleaser/goreleaser-action@v2
         with:
           args: release --rm-dist
-          version: v1.0.0
+          version: v1.1.0
         env:
           GITHUB_TOKEN: ${{ secrets.CUECKOO_GITHUB_PAT }}
diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -10,13 +10,7 @@ builds:
   binary: cue
   ldflags:
     - -s -w
-    # TODO: consider adding the following for a verbose mode
-    # - -X cuelang.org/go/cmd/cue/cmd.version={{.Version}}
-    # - -X cuelang.org/go/cmd/cue/cmd.commit={{.ShortCommit}}
-    # - -X cuelang.org/go/cmd/cue/cmd.date={{.Date}}
-    # - -X cuelang.org/cmd/cue/cmd.date={{.Env.GOVERSION}}
   goos:
-    # File and Issue to request including other platforms.
     - darwin
     - linux
     - windows
@@ -80,11 +74,12 @@ dockers:
   - --label=org.opencontainers.image.revision={{ .FullCommit }}
   - --label=org.opencontainers.image.licenses=Apache 2.0
 - image_templates:
-  - "docker.io/cuelang/cue:{{ .Version }}-arm64v8"
+  - "docker.io/cuelang/cue:{{ .Version }}-arm64"
+  goarch: arm64
   dockerfile: Dockerfile
   use: buildx
   build_flag_templates:
-  - --platform=linux/arm64/v8
+  - --platform=linux/arm64
   - --label=org.opencontainers.image.title={{ .ProjectName }}
   - --label=org.opencontainers.image.description={{ .ProjectName }}
   - --label=org.opencontainers.image.url=https://github.com/cue-lang/cue
@@ -98,8 +93,8 @@ docker_manifests:
 - name_template: docker.io/cuelang/cue:{{ .Version }}
   image_templates:
   - docker.io/cuelang/cue:{{ .Version }}-amd64
-  - docker.io/cuelang/cue:{{ .Version }}-arm64v8
+  - docker.io/cuelang/cue:{{ .Version }}-arm64
 - name_template: docker.io/cuelang/cue:latest
   image_templates:
   - docker.io/cuelang/cue:{{ .Version }}-amd64
-  - docker.io/cuelang/cue:{{ .Version }}-arm64v8
+  - docker.io/cuelang/cue:{{ .Version }}-arm64
diff --git a/cmd/cue/cmd/testdata/script/cmd_github.txt b/cmd/cue/cmd/testdata/script/cmd_github.txt
@@ -104,7 +104,7 @@ jobs:
         uses: goreleaser/goreleaser-action@v2
         with:
           args: release --rm-dist
-          version: v1.0.0
+          version: v1.1.0
         env:
           GITHUB_TOKEN: ${{ secrets.CUECKOO_GITHUB_PAT }}
 -- .github/workflows/repository_dispatch.yml.golden --
@@ -1279,7 +1279,7 @@ release: _#bashWorkflow & {
 			uses: "goreleaser/goreleaser-action@v2"
 			with: {
 				args:    "release --rm-dist"
-				version: "v1.0.0"
+				version: "v1.1.0"
 			}
 		}]
 	}

diff --git a/cue/testdata/eval/github.txtar b/cue/testdata/eval/github.txtar
@@ -192,7 +192,7 @@ release: _#bashWorkflow & {
 			uses: "goreleaser/goreleaser-action@v2"
 			with: {
 				args:    "release --rm-dist"
-				version: "v1.0.0"
+				version: "v1.1.0"
 			}
 		}]
 	}
@@ -1416,7 +1416,7 @@ import "strings"
                 uses: (string){ "goreleaser/goreleaser-action@v2" }
                 with: (#struct){
                   args: (string){ "release --rm-dist" }
-                  version: (string){ "v1.0.0" }
+                  version: (string){ "v1.1.0" }
                 }
               }
             }
@@ -1990,7 +1990,7 @@ import "strings"
             uses: (string){ "goreleaser/goreleaser-action@v2" }
             with: (#struct){
               args: (string){ "release --rm-dist" }
-              version: (string){ "v1.0.0" }
+              version: (string){ "v1.1.0" }
             }
           }
         }
@@ -2541,7 +2541,7 @@ import "strings"
             uses: "goreleaser/goreleaser-action@v2"
             with: {
               args: "release --rm-dist"
-              version: "v1.0.0"
+              version: "v1.1.0"
             }
           }),
         ]

diff --git a/internal/ci/workflows.cue b/internal/ci/workflows.cue
@@ -257,7 +257,7 @@ release: _#bashWorkflow & {
 					uses: "goreleaser/goreleaser-action@v2"
 					with: {
 						args:    "release --rm-dist"
-						version: "v1.0.0"
+						version: "v1.1.0"
 					}
 				},
 			]