Skip to content

Commit 23a3387

Browse files
authored
Updates on ci/goreleaser (#424)
* bump deps and go to 1.22 Signed-off-by: cpanato <[email protected]> * update ci jobs Signed-off-by: cpanato <[email protected]> * fix lints Signed-off-by: cpanato <[email protected]> * start publishing the images to ghcr.io Signed-off-by: cpanato <[email protected]> * add extra permission Signed-off-by: cpanato <[email protected]> * sync Signed-off-by: cpanato <[email protected]> --------- Signed-off-by: cpanato <[email protected]>
1 parent 9996af3 commit 23a3387

File tree

10 files changed

+298
-278
lines changed

10 files changed

+298
-278
lines changed

.github/auto-merge-deps.yml

-27
This file was deleted.

.github/dependabot.yml

+12
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,24 @@
1+
---
12
version: 2
23
updates:
4+
35
- package-ecosystem: gomod
46
directory: "/"
57
schedule:
68
interval: weekly
79
open-pull-requests-limit: 10
10+
groups:
11+
gomod:
12+
update-types:
13+
- "patch"
14+
815
- package-ecosystem: "github-actions"
916
directory: "/"
1017
schedule:
1118
interval: weekly
1219
open-pull-requests-limit: 10
20+
groups:
21+
actions:
22+
update-types:
23+
- "minor"
24+
- "patch"

.github/workflows/ci.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Setup Go
1717
uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
1818
with:
19-
go-version-file: './go.mod'
19+
go-version: '1.22'
2020
check-latest: true
2121

2222
- name: Set up QEMU
@@ -50,7 +50,7 @@ jobs:
5050
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
5151
- uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
5252
with:
53-
go-version-file: './go.mod'
53+
go-version: '1.22'
5454
check-latest: true
5555

5656
- name: generate docs
@@ -76,4 +76,4 @@ jobs:
7676
- name: golangci-lint
7777
uses: golangci/golangci-lint-action@a4f60bb28d35aeee14e6880718e0c85ff1882e64 # v6.0.1
7878
with:
79-
version: v1.55
79+
version: v1.59

.github/workflows/release.yaml

+6-16
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
name: Release
22

33
on:
4-
workflow_dispatch:
5-
inputs:
6-
version:
7-
description: Version
8-
required: true
4+
push:
5+
tags:
6+
- 'v*'
97

108
jobs:
119
release:
@@ -14,6 +12,7 @@ jobs:
1412
permissions:
1513
id-token: write
1614
contents: write
15+
packages: write
1716

1817
steps:
1918
- name: Checkout
@@ -24,7 +23,7 @@ jobs:
2423
- name: Setup Go
2524
uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
2625
with:
27-
go-version-file: './go.mod'
26+
go-version: '1.22'
2827
check-latest: true
2928

3029
- name: Set up QEMU
@@ -54,15 +53,6 @@ jobs:
5453
5554
- uses: chainguard-dev/actions/goimports@main
5655

57-
- name: Tag
58-
run: |
59-
git config user.name "$GITHUB_ACTOR"
60-
git config user.email "[email protected]"
61-
62-
tag='${{ github.event.inputs.version }}'
63-
git tag --annotate --message "Tag for release $tag" "$tag"
64-
git push origin "refs/tags/$tag"
65-
6656
- name: Login to registry
6757
uses: docker/login-action@0d4c9c5ea7693da7b068278f7b52bda2a190a446 # v3.2.0
6858
with:
@@ -75,4 +65,4 @@ jobs:
7565
with:
7666
args: -v release
7767
env:
78-
GITHUB_TOKEN: "${{ secrets.CI_TOKEN }}"
68+
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"

.goreleaser.yml

+24
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,8 @@ dockers:
6262
image_templates:
6363
- quay.io/helmpack/chart-releaser:{{ .Tag }}-amd64
6464
- quay.io/helmpack/chart-releaser:latest-amd64
65+
- ghcr.io/helm/chart-releaser:{{ .Tag }}-amd64
66+
- ghcr.io/helm/chart-releaser:latest-amd64
6567
build_flag_templates:
6668
- "--platform=linux/amd64"
6769
- --label=org.label-schema.schema-version=1.0
@@ -79,6 +81,8 @@ dockers:
7981
image_templates:
8082
- quay.io/helmpack/chart-releaser:{{ .Tag }}-arm64
8183
- quay.io/helmpack/chart-releaser:latest-arm64
84+
- ghcr.io/helm/chart-releaser:{{ .Tag }}-arm64
85+
- ghcr.io/helm/chart-releaser:latest-arm64
8286
build_flag_templates:
8387
- "--platform=linux/arm64"
8488
- --label=org.label-schema.schema-version=1.0
@@ -97,6 +101,8 @@ dockers:
97101
image_templates:
98102
- quay.io/helmpack/chart-releaser:{{ .Tag }}-armv7
99103
- quay.io/helmpack/chart-releaser:latest-armv7
104+
- ghcr.io/helm/chart-releaser:{{ .Tag }}-armv7
105+
- ghcr.io/helm/chart-releaser:latest-armv7
100106
build_flag_templates:
101107
- "--platform=linux/arm/v7"
102108
- --label=org.label-schema.schema-version=1.0
@@ -114,6 +120,8 @@ dockers:
114120
image_templates:
115121
- quay.io/helmpack/chart-releaser:{{ .Tag }}-s390x
116122
- quay.io/helmpack/chart-releaser:latest-s390x
123+
- ghcr.io/helm/chart-releaser:{{ .Tag }}-s390x
124+
- ghcr.io/helm/chart-releaser:latest-s390x
117125
build_flag_templates:
118126
- "--platform=linux/s390x"
119127
- --label=org.label-schema.schema-version=1.0
@@ -131,6 +139,8 @@ dockers:
131139
image_templates:
132140
- quay.io/helmpack/chart-releaser:{{ .Tag }}-ppc64le
133141
- quay.io/helmpack/chart-releaser:latest-ppc64le
142+
- ghcr.io/helm/chart-releaser:{{ .Tag }}-ppc64le
143+
- ghcr.io/helm/chart-releaser:latest-ppc64le
134144
build_flag_templates:
135145
- "--platform=linux/ppc64le"
136146
- --label=org.label-schema.schema-version=1.0
@@ -148,13 +158,27 @@ docker_manifests:
148158
- quay.io/helmpack/chart-releaser:{{ .Tag }}-armv7
149159
- quay.io/helmpack/chart-releaser:{{ .Tag }}-s390x
150160
- quay.io/helmpack/chart-releaser:{{ .Tag }}-ppc64le
161+
- name_template: ghcr.io/helm/chart-releaser:{{ .Tag }}
162+
image_templates:
163+
- ghcr.io/helm/chart-releaser:{{ .Tag }}-amd64
164+
- ghcr.io/helm/chart-releaser:{{ .Tag }}-arm64
165+
- ghcr.io/helm/chart-releaser:{{ .Tag }}-armv7
166+
- ghcr.io/helm/chart-releaser:{{ .Tag }}-s390x
167+
- ghcr.io/helm/chart-releaser:{{ .Tag }}-ppc64le
151168
- name_template: quay.io/helmpack/chart-releaser:latest
152169
image_templates:
153170
- quay.io/helmpack/chart-releaser:latest-amd64
154171
- quay.io/helmpack/chart-releaser:latest-arm64
155172
- quay.io/helmpack/chart-releaser:latest-armv7
156173
- quay.io/helmpack/chart-releaser:latest-s390x
157174
- quay.io/helmpack/chart-releaser:latest-ppc64le
175+
- name_template: ghcr.io/helm/chart-releaser:latest
176+
image_templates:
177+
- ghcr.io/helm/chart-releaser:latest-amd64
178+
- ghcr.io/helm/chart-releaser:latest-arm64
179+
- ghcr.io/helm/chart-releaser:latest-armv7
180+
- ghcr.io/helm/chart-releaser:latest-s390x
181+
- ghcr.io/helm/chart-releaser:latest-ppc64le
158182

159183
signs:
160184
- id: all

cr/cmd/index.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ var indexCmd = &cobra.Command{
3333
Update a Helm chart repository index.yaml file based on a the
3434
given GitHub repository's releases.
3535
`,
36-
RunE: func(cmd *cobra.Command, args []string) error {
36+
RunE: func(cmd *cobra.Command, _ []string) error {
3737
config, err := config.LoadConfiguration(cfgFile, cmd, getRequiredIndexArgs())
3838
if err != nil {
3939
return err

cr/cmd/upload.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ var uploadCmd = &cobra.Command{
2727
Use: "upload",
2828
Short: "Upload Helm chart packages to GitHub Releases",
2929
Long: `Upload Helm chart packages to GitHub Releases`,
30-
RunE: func(cmd *cobra.Command, args []string) error {
30+
RunE: func(cmd *cobra.Command, _ []string) error {
3131
config, err := config.LoadConfiguration(cfgFile, cmd, getRequiredUploadArgs())
3232
if err != nil {
3333
return err

cr/cmd/version.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ type Info struct {
4949
var versionCmd = &cobra.Command{
5050
Use: "version",
5151
Short: "Print version information",
52-
RunE: func(cmd *cobra.Command, args []string) error {
52+
RunE: func(_ *cobra.Command, _ []string) error {
5353
v := GetVersionInfo()
5454
res := v.String()
5555
if outputJSON {

0 commit comments

Comments
 (0)