Skip to content

Commit 795719e

Browse files
committed
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 <[email protected]> Change-Id: I347cff60175227ed5f3375b3863dcf0302f21d80 Reviewed-on: https://review.gerrithub.io/c/cue-lang/cue/+/528605 Unity-Result: CUEcueckoo <[email protected]> TryBot-Result: CUEcueckoo <[email protected]>
1 parent b68f4c3 commit 795719e

File tree

5 files changed

+13
-18
lines changed

5 files changed

+13
-18
lines changed

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,6 @@ jobs:
3535
uses: goreleaser/goreleaser-action@v2
3636
with:
3737
args: release --rm-dist
38-
version: v1.0.0
38+
version: v1.1.0
3939
env:
4040
GITHUB_TOKEN: ${{ secrets.CUECKOO_GITHUB_PAT }}

.goreleaser.yml

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,7 @@ builds:
1010
binary: cue
1111
ldflags:
1212
- -s -w
13-
# TODO: consider adding the following for a verbose mode
14-
# - -X cuelang.org/go/cmd/cue/cmd.version={{.Version}}
15-
# - -X cuelang.org/go/cmd/cue/cmd.commit={{.ShortCommit}}
16-
# - -X cuelang.org/go/cmd/cue/cmd.date={{.Date}}
17-
# - -X cuelang.org/cmd/cue/cmd.date={{.Env.GOVERSION}}
1813
goos:
19-
# File and Issue to request including other platforms.
2014
- darwin
2115
- linux
2216
- windows
@@ -80,11 +74,12 @@ dockers:
8074
- --label=org.opencontainers.image.revision={{ .FullCommit }}
8175
- --label=org.opencontainers.image.licenses=Apache 2.0
8276
- image_templates:
83-
- "docker.io/cuelang/cue:{{ .Version }}-arm64v8"
77+
- "docker.io/cuelang/cue:{{ .Version }}-arm64"
78+
goarch: arm64
8479
dockerfile: Dockerfile
8580
use: buildx
8681
build_flag_templates:
87-
- --platform=linux/arm64/v8
82+
- --platform=linux/arm64
8883
- --label=org.opencontainers.image.title={{ .ProjectName }}
8984
- --label=org.opencontainers.image.description={{ .ProjectName }}
9085
- --label=org.opencontainers.image.url=https://github.com/cue-lang/cue
@@ -98,8 +93,8 @@ docker_manifests:
9893
- name_template: docker.io/cuelang/cue:{{ .Version }}
9994
image_templates:
10095
- docker.io/cuelang/cue:{{ .Version }}-amd64
101-
- docker.io/cuelang/cue:{{ .Version }}-arm64v8
96+
- docker.io/cuelang/cue:{{ .Version }}-arm64
10297
- name_template: docker.io/cuelang/cue:latest
10398
image_templates:
10499
- docker.io/cuelang/cue:{{ .Version }}-amd64
105-
- docker.io/cuelang/cue:{{ .Version }}-arm64v8
100+
- docker.io/cuelang/cue:{{ .Version }}-arm64

cmd/cue/cmd/testdata/script/cmd_github.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ jobs:
104104
uses: goreleaser/goreleaser-action@v2
105105
with:
106106
args: release --rm-dist
107-
version: v1.0.0
107+
version: v1.1.0
108108
env:
109109
GITHUB_TOKEN: ${{ secrets.CUECKOO_GITHUB_PAT }}
110110
-- .github/workflows/repository_dispatch.yml.golden --
@@ -1279,7 +1279,7 @@ release: _#bashWorkflow & {
12791279
uses: "goreleaser/goreleaser-action@v2"
12801280
with: {
12811281
args: "release --rm-dist"
1282-
version: "v1.0.0"
1282+
version: "v1.1.0"
12831283
}
12841284
}]
12851285
}

cue/testdata/eval/github.txtar

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ release: _#bashWorkflow & {
192192
uses: "goreleaser/goreleaser-action@v2"
193193
with: {
194194
args: "release --rm-dist"
195-
version: "v1.0.0"
195+
version: "v1.1.0"
196196
}
197197
}]
198198
}
@@ -1416,7 +1416,7 @@ import "strings"
14161416
uses: (string){ "goreleaser/goreleaser-action@v2" }
14171417
with: (#struct){
14181418
args: (string){ "release --rm-dist" }
1419-
version: (string){ "v1.0.0" }
1419+
version: (string){ "v1.1.0" }
14201420
}
14211421
}
14221422
}
@@ -1990,7 +1990,7 @@ import "strings"
19901990
uses: (string){ "goreleaser/goreleaser-action@v2" }
19911991
with: (#struct){
19921992
args: (string){ "release --rm-dist" }
1993-
version: (string){ "v1.0.0" }
1993+
version: (string){ "v1.1.0" }
19941994
}
19951995
}
19961996
}
@@ -2541,7 +2541,7 @@ import "strings"
25412541
uses: "goreleaser/goreleaser-action@v2"
25422542
with: {
25432543
args: "release --rm-dist"
2544-
version: "v1.0.0"
2544+
version: "v1.1.0"
25452545
}
25462546
}),
25472547
]

internal/ci/workflows.cue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ release: _#bashWorkflow & {
257257
uses: "goreleaser/goreleaser-action@v2"
258258
with: {
259259
args: "release --rm-dist"
260-
version: "v1.0.0"
260+
version: "v1.1.0"
261261
}
262262
},
263263
]

0 commit comments

Comments
 (0)