Skip to content

Commit

Permalink
feat: goreleaser v1.7.1
Browse files Browse the repository at this point in the history
Signed-off-by: Artur Troian <[email protected]>
  • Loading branch information
troian committed Mar 22, 2022
1 parent 8a6a327 commit 4650ae6
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .env
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
GO_VERSION=1.17.8
GIT_CHGLOG_VERSION=v0.15.0
GORELEASER_VERSION=1.5.0
GORELEASER_VERSION=1.7.0
OSX_SDK=MacOSX12.0.sdk
OSX_SDK_SUM=ac07f28c09e6a3b09a1c01f1535ee71abe8017beaedd09181c8f08936a510ffd
OSX_VERSION_MIN=10.9
OSX_CROSS_COMMIT=e59a63461da2cbc20cb0a5bbfc954730e50a5472
DEBIAN_FRONTEND=noninteractive
TINI_VERSION=v0.19.0
COSIGN_VERSION=1.4.1
COSIGN_VERSION=1.6.0
COSIGN_SHA256=65de2f3f2844815ed20ab939319e3dad4238a9aaaf4893b22ec5702e9bc33755
2 changes: 1 addition & 1 deletion Dockerfile.base
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ ARG COSIGN_SHA256
ARG GORELEASER_DOWNLOAD_URL=https://github.com/goreleaser/goreleaser/releases/download/v${GORELEASER_VERSION}

# install cosign
COPY --from=gcr.io/projectsigstore/cosign:v1.4.1@sha256:502d5130431e45f28c51d2c24a05ef5ccd3fd916bcc91db0c8bee3a81e09a0bb /ko-app/cosign /usr/local/bin/cosign
COPY --from=gcr.io/projectsigstore/cosign:v1.6.0@sha256:b667002156c4bf9fedd9273f689b800bb5c341660e710e3bbac981c9795423d9 /ko-app/cosign /usr/local/bin/cosign
COPY entrypoint.sh /

# Install deps
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
include .env

REGISTRY ?= ghcr.io
TAG_VERSION ?= $(shell git describe --tags --abbrev=0)

ifeq ($(REGISTRY),)
IMAGE_BASE_NAME := goreleaser/goreleaser-cross-base:$(TAG_VERSION)
Expand All @@ -17,7 +18,6 @@ OSX_CROSS_COMMIT := e59a63461da2cbc20cb0a5bbfc954730e50a5472
DEBIAN_FRONTEND := noninteractive
GORELEASER_VERSION ?= 1.1.0
TINI_VERSION ?= v0.19.0
GORELEASER_TAG ?= $(shell git describe --tags --abbrev=0)
COSIGN_VERSION ?= 1.3.0
COSIGN_SHA256 ?= 65de2f3f2844815ed20ab939319e3dad4238a9aaaf4893b22ec5702e9bc33755

Expand Down Expand Up @@ -103,4 +103,4 @@ tags:

.PHONY: tag
tag:
@echo $(GORELEASER_TAG)
@echo $(TAG_VERSION)
6 changes: 6 additions & 0 deletions scripts/image-tags.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ function generate_tags {
tag=$(make tag)
GORELEASER_VERSION=v$GORELEASER_VERSION

tag_minor=v$("${SCRIPT_DIR}/semver.sh" get major "$tag").$("${SCRIPT_DIR}/semver.sh" get minor "$tag")

if [[ $("${SCRIPT_DIR}"/is_prerelease.sh "$tag") == true ]]; then
echo "$hub:$tag.$GORELEASER_VERSION"
echo "$hub:$tag"
Expand All @@ -20,9 +22,13 @@ function generate_tags {
else
echo "$hub:latest"
echo "$hub:$tag-$GORELEASER_VERSION"
echo "$hub:$tag_minor-$GORELEASER_VERSION"
echo "$hub:$tag_minor"
echo "$hub:$tag"
echo "$ghcr:latest"
echo "$ghcr:$tag-$GORELEASER_VERSION"
echo "$ghcr:$tag_minor-$GORELEASER_VERSION"
echo "$ghcr:$tag_minor"
echo "$ghcr:$tag"
fi

Expand Down

0 comments on commit 4650ae6

Please sign in to comment.