Skip to content

Commit

Permalink
build: update goreleaser to v1.10.3; cleanup .goreleaser.yml
Browse files Browse the repository at this point in the history
Signed-off-by: nscuro <nscuro@protonmail.com>
  • Loading branch information
nscuro committed Aug 10, 2022
1 parent 768a18a commit a97d4dc
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 25 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/goreleaser-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@ jobs:
- name: Run GoReleaser
uses: goreleaser/goreleaser-action@v3.0.0
with:
version: 1.7.0
version: 1.10.3
args: release --skip-publish --skip-sign --snapshot
7 changes: 2 additions & 5 deletions .github/workflows/goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ on:
tags:
- 'v*'


# Source: https://github.com/goreleaser/supply-chain-example/blob/main/.github/workflows/release.yml
permissions:
contents: write # needed to write releases
id-token: write # needed for keyless signing
Expand All @@ -26,7 +24,7 @@ jobs:
with:
go-version: "1.18"
check-latest: true
- uses: sigstore/cosign-installer@v2.5.0 # installs cosign
- uses: sigstore/cosign-installer@v2.5.0
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
- name: Docker login
Expand All @@ -37,8 +35,7 @@ jobs:
- name: Run GoReleaser
uses: goreleaser/goreleaser-action@v3.0.0
with:
version: 1.7.0
version: 1.10.3
args: release --rm-dist
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
docker_repository_owner: cyclonedx
33 changes: 14 additions & 19 deletions .goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ builds:
- amd64
- arm64
flags: -trimpath
ldflags: -s -w -X github.com/CycloneDX/cyclonedx-gomod/internal/version.Version={{ .Tag }}
ldflags: -s -w
main: ./cmd/cyclonedx-gomod
mod_timestamp: "{{ .CommitTimestamp }}"

Expand All @@ -34,9 +34,6 @@ sboms:
- GOARCH={{ .Arch }}
- GOOS={{ .Os }}

# signs the checksum file
# all files (including the sboms) are included in the checksum, so we don't need to sign each one if we don't want to
# https://goreleaser.com/customization/sign
signs:
- cmd: cosign
env:
Expand All @@ -56,7 +53,7 @@ dockers:
dockerfile: Dockerfile.goreleaser
use: buildx
image_templates:
- "{{ .Env.docker_repository_owner }}/{{ .ProjectName }}:{{ .Tag }}-amd64"
- "cyclonedx/{{ .ProjectName }}:{{ .Tag }}-amd64"
build_flag_templates:
- "--platform=linux/amd64"
- "--label=org.opencontainers.image.title={{ .ProjectName }}"
Expand All @@ -71,7 +68,7 @@ dockers:
dockerfile: Dockerfile.goreleaser
use: buildx
image_templates:
- "{{ .Env.docker_repository_owner }}/{{ .ProjectName }}:{{ .Tag }}-arm64"
- "cyclonedx/{{ .ProjectName }}:{{ .Tag }}-arm64"
build_flag_templates:
- "--platform=linux/arm64"
- "--label=org.opencontainers.image.title={{ .ProjectName }}"
Expand All @@ -83,25 +80,23 @@ dockers:
- "--label=org.opencontainers.image.source={{ .GitURL }}"

docker_manifests:
- name_template: "{{ .Env.docker_repository_owner }}/{{ .ProjectName }}:latest"
- name_template: "cyclonedx/{{ .ProjectName }}:latest"
image_templates:
- "{{ .Env.docker_repository_owner }}/{{ .ProjectName }}:{{ .Tag }}-amd64"
- "{{ .Env.docker_repository_owner }}/{{ .ProjectName }}:{{ .Tag }}-arm64"
- name_template: "{{ .Env.docker_repository_owner }}/{{ .ProjectName }}:{{ .Tag }}"
- "cyclonedx/{{ .ProjectName }}:{{ .Tag }}-amd64"
- "cyclonedx/{{ .ProjectName }}:{{ .Tag }}-arm64"
- name_template: "cyclonedx/{{ .ProjectName }}:{{ .Tag }}"
image_templates:
- "{{ .Env.docker_repository_owner }}/{{ .ProjectName }}:{{ .Tag }}-amd64"
- "{{ .Env.docker_repository_owner }}/{{ .ProjectName }}:{{ .Tag }}-arm64"
- "cyclonedx/{{ .ProjectName }}:{{ .Tag }}-amd64"
- "cyclonedx/{{ .ProjectName }}:{{ .Tag }}-arm64"
- name_template: "{{ .Env.docker_repository_owner}}/{{ .ProjectName }}:v{{ .Major }}"
image_templates:
- "{{ .Env.docker_repository_owner }}/{{ .ProjectName }}:{{ .Tag }}-amd64"
- "{{ .Env.docker_repository_owner }}/{{ .ProjectName }}:{{ .Tag }}-arm64"
- name_template: "{{ .Env.docker_repository_owner }}/{{ .ProjectName }}:v{{ .Major }}.{{ .Minor }}"
- "cyclonedx/{{ .ProjectName }}:{{ .Tag }}-amd64"
- "cyclonedx/{{ .ProjectName }}:{{ .Tag }}-arm64"
- name_template: "cyclonedx/{{ .ProjectName }}:v{{ .Major }}.{{ .Minor }}"
image_templates:
- "{{ .Env.docker_repository_owner }}/{{ .ProjectName }}:{{ .Tag }}-amd64"
- "{{ .Env.docker_repository_owner }}/{{ .ProjectName }}:{{ .Tag }}-arm64"
- "cyclonedx/{{ .ProjectName }}:{{ .Tag }}-amd64"
- "cyclonedx/{{ .ProjectName }}:{{ .Tag }}-arm64"

# signs our docker image
# https://goreleaser.com/customization/docker_sign
docker_signs:
- cmd: cosign
env:
Expand Down

0 comments on commit a97d4dc

Please sign in to comment.