Updates on ci/goreleaser (#424)

* bump deps and go to 1.22 Signed-off-by: cpanato <ctadeu@gmail.com> * update ci jobs Signed-off-by: cpanato <ctadeu@gmail.com> * fix lints Signed-off-by: cpanato <ctadeu@gmail.com> * start publishing the images to ghcr.io Signed-off-by: cpanato <ctadeu@gmail.com> * add extra permission Signed-off-by: cpanato <ctadeu@gmail.com> * sync Signed-off-by: cpanato <ctadeu@gmail.com> --------- Signed-off-by: cpanato <ctadeu@gmail.com>
helm · Jun 17, 2024 · 23a3387 · 23a3387
1 parent 9996af3
commit 23a3387
Show file tree

Hide file tree

Showing 10 changed files with 298 additions and 278 deletions.
diff --git a/.github/auto-merge-deps.yml b/.github/auto-merge-deps.yml
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -1,12 +1,24 @@
+---
 version: 2
 updates:
+
   - package-ecosystem: gomod
     directory: "/"
     schedule:
       interval: weekly
     open-pull-requests-limit: 10
+    groups:
+      gomod:
+        update-types:
+          - "patch"
+
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
       interval: weekly
     open-pull-requests-limit: 10
+    groups:
+      actions:
+        update-types:
+          - "minor"
+          - "patch"
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -16,7 +16,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
         with:
-          go-version-file: './go.mod'
+          go-version: '1.22'
           check-latest: true
 
       - name: Set up QEMU
@@ -50,7 +50,7 @@ jobs:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
       - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
         with:
-          go-version-file: './go.mod'
+          go-version: '1.22'
           check-latest: true
 
       - name: generate docs
@@ -76,4 +76,4 @@ jobs:
       - name: golangci-lint
         uses: golangci/golangci-lint-action@a4f60bb28d35aeee14e6880718e0c85ff1882e64 # v6.0.1
         with:
-          version: v1.55
+          version: v1.59
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -1,11 +1,9 @@
 name: Release
 
 on:
-  workflow_dispatch:
-    inputs:
-      version:
-        description: Version
-        required: true
+  push:
+    tags:
+      - 'v*'
 
 jobs:
   release:
@@ -14,6 +12,7 @@ jobs:
     permissions:
       id-token: write
       contents: write
+      packages: write
 
     steps:
       - name: Checkout
@@ -24,7 +23,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
         with:
-          go-version-file: './go.mod'
+          go-version: '1.22'
           check-latest: true
 
       - name: Set up QEMU
@@ -54,15 +53,6 @@ jobs:
 
       - uses: chainguard-dev/actions/goimports@main
 
-      - name: Tag
-        run: |
-          git config user.name "$GITHUB_ACTOR"
-          git config user.email "$GITHUB_ACTOR@users.noreply.github.com"
-
-          tag='${{ github.event.inputs.version }}'
-          git tag --annotate --message "Tag for release $tag" "$tag"
-          git push origin "refs/tags/$tag"
-
       - name: Login to registry
         uses: docker/login-action@0d4c9c5ea7693da7b068278f7b52bda2a190a446 # v3.2.0
         with:
@@ -75,4 +65,4 @@ jobs:
         with:
           args: -v release
         env:
-          GITHUB_TOKEN: "${{ secrets.CI_TOKEN }}"
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -62,6 +62,8 @@ dockers:
     image_templates:
       - quay.io/helmpack/chart-releaser:{{ .Tag }}-amd64
       - quay.io/helmpack/chart-releaser:latest-amd64
+      - ghcr.io/helm/chart-releaser:{{ .Tag }}-amd64
+      - ghcr.io/helm/chart-releaser:latest-amd64
     build_flag_templates:
       - "--platform=linux/amd64"
       - --label=org.label-schema.schema-version=1.0
@@ -79,6 +81,8 @@ dockers:
     image_templates:
       - quay.io/helmpack/chart-releaser:{{ .Tag }}-arm64
       - quay.io/helmpack/chart-releaser:latest-arm64
+      - ghcr.io/helm/chart-releaser:{{ .Tag }}-arm64
+      - ghcr.io/helm/chart-releaser:latest-arm64
     build_flag_templates:
       - "--platform=linux/arm64"
       - --label=org.label-schema.schema-version=1.0
@@ -97,6 +101,8 @@ dockers:
     image_templates:
       - quay.io/helmpack/chart-releaser:{{ .Tag }}-armv7
       - quay.io/helmpack/chart-releaser:latest-armv7
+      - ghcr.io/helm/chart-releaser:{{ .Tag }}-armv7
+      - ghcr.io/helm/chart-releaser:latest-armv7
     build_flag_templates:
       - "--platform=linux/arm/v7"
       - --label=org.label-schema.schema-version=1.0
@@ -114,6 +120,8 @@ dockers:
     image_templates:
       - quay.io/helmpack/chart-releaser:{{ .Tag }}-s390x
       - quay.io/helmpack/chart-releaser:latest-s390x
+      - ghcr.io/helm/chart-releaser:{{ .Tag }}-s390x
+      - ghcr.io/helm/chart-releaser:latest-s390x
     build_flag_templates:
       - "--platform=linux/s390x"
       - --label=org.label-schema.schema-version=1.0
@@ -131,6 +139,8 @@ dockers:
     image_templates:
       - quay.io/helmpack/chart-releaser:{{ .Tag }}-ppc64le
       - quay.io/helmpack/chart-releaser:latest-ppc64le
+      - ghcr.io/helm/chart-releaser:{{ .Tag }}-ppc64le
+      - ghcr.io/helm/chart-releaser:latest-ppc64le
     build_flag_templates:
       - "--platform=linux/ppc64le"
       - --label=org.label-schema.schema-version=1.0
@@ -148,13 +158,27 @@ docker_manifests:
       - quay.io/helmpack/chart-releaser:{{ .Tag }}-armv7
       - quay.io/helmpack/chart-releaser:{{ .Tag }}-s390x
       - quay.io/helmpack/chart-releaser:{{ .Tag }}-ppc64le
+  - name_template: ghcr.io/helm/chart-releaser:{{ .Tag }}
+    image_templates:
+      - ghcr.io/helm/chart-releaser:{{ .Tag }}-amd64
+      - ghcr.io/helm/chart-releaser:{{ .Tag }}-arm64
+      - ghcr.io/helm/chart-releaser:{{ .Tag }}-armv7
+      - ghcr.io/helm/chart-releaser:{{ .Tag }}-s390x
+      - ghcr.io/helm/chart-releaser:{{ .Tag }}-ppc64le
   - name_template: quay.io/helmpack/chart-releaser:latest
     image_templates:
       - quay.io/helmpack/chart-releaser:latest-amd64
       - quay.io/helmpack/chart-releaser:latest-arm64
       - quay.io/helmpack/chart-releaser:latest-armv7
       - quay.io/helmpack/chart-releaser:latest-s390x
       - quay.io/helmpack/chart-releaser:latest-ppc64le
+  - name_template: ghcr.io/helm/chart-releaser:latest
+    image_templates:
+      - ghcr.io/helm/chart-releaser:latest-amd64
+      - ghcr.io/helm/chart-releaser:latest-arm64
+      - ghcr.io/helm/chart-releaser:latest-armv7
+      - ghcr.io/helm/chart-releaser:latest-s390x
+      - ghcr.io/helm/chart-releaser:latest-ppc64le
 
 signs:
   - id: all

diff --git a/cr/cmd/index.go b/cr/cmd/index.go
@@ -33,7 +33,7 @@ var indexCmd = &cobra.Command{
 Update a Helm chart repository index.yaml file based on a the
 given GitHub repository's releases.
 	`,
-	RunE: func(cmd *cobra.Command, args []string) error {
+	RunE: func(cmd *cobra.Command, _ []string) error {
 		config, err := config.LoadConfiguration(cfgFile, cmd, getRequiredIndexArgs())
 		if err != nil {
 			return err

diff --git a/cr/cmd/upload.go b/cr/cmd/upload.go
@@ -27,7 +27,7 @@ var uploadCmd = &cobra.Command{
 	Use:   "upload",
 	Short: "Upload Helm chart packages to GitHub Releases",
 	Long:  `Upload Helm chart packages to GitHub Releases`,
-	RunE: func(cmd *cobra.Command, args []string) error {
+	RunE: func(cmd *cobra.Command, _ []string) error {
 		config, err := config.LoadConfiguration(cfgFile, cmd, getRequiredUploadArgs())
 		if err != nil {
 			return err

diff --git a/cr/cmd/version.go b/cr/cmd/version.go
@@ -49,7 +49,7 @@ type Info struct {
 var versionCmd = &cobra.Command{
 	Use:   "version",
 	Short: "Print version information",
-	RunE: func(cmd *cobra.Command, args []string) error {
+	RunE: func(_ *cobra.Command, _ []string) error {
 		v := GetVersionInfo()
 		res := v.String()
 		if outputJSON {