Skip to content

Commit 4d6757a

Browse files
authored
bump goreleaser, remove obsolete substitute task (#147)
1 parent 71c2e2a commit 4d6757a

File tree

4 files changed

+10
-14
lines changed

4 files changed

+10
-14
lines changed

.github/workflows/release.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,12 @@ jobs:
3939
if [[ $GITHUB_REF == refs/tags/* ]]; then
4040
# Release tags.
4141
echo IMAGE_TAG="${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
42-
echo GORELEASER_ARGS="--rm-dist" >> $GITHUB_ENV
43-
echo DISABLE_RELEASE_PIPELINE=false >> $GITHUB_ENV
42+
echo GORELEASER_ARGS="--clean" >> $GITHUB_ENV
43+
echo ENABLE_RELEASE_PIPELINE=true >> $GITHUB_ENV
4444
elif [[ $GITHUB_REF == refs/heads/* ]]; then
4545
# Branch build.
4646
echo IMAGE_TAG="$(echo "${GITHUB_REF#refs/heads/}" | sed -r 's|/+|-|g')" >> $GITHUB_ENV
47-
echo GORELEASER_ARGS="--rm-dist --skip-validate" >> $GITHUB_ENV
47+
echo GORELEASER_ARGS="--clean --skip-validate" >> $GITHUB_ENV
4848
elif [[ $GITHUB_REF == refs/pull/* ]]; then
4949
# PR build.
5050
echo IMAGE_TAG="pr-$(echo "${GITHUB_REF}" | sed -E 's|refs/pull/([^/]+)/?.*|\1|')" >> $GITHUB_ENV

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ Dockerfile.cross
1818

1919
# Release output
2020
dist/**
21-
.goreleaser.yml
2221
operator-controller.yaml
2322

2423
# Kubernetes Generated files - skip generated files, except for vendored files

.goreleaser.template.yml renamed to .goreleaser.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ snapshot:
5454
name_template: "{{ incpatch .Version }}-next"
5555
changelog:
5656
use: github-native
57-
skip: $DISABLE_RELEASE_PIPELINE
57+
skip: '{{ ne .Env.ENABLE_RELEASE_PIPELINE "true" }}'
5858
release:
59-
disable: $DISABLE_RELEASE_PIPELINE
59+
disable: '{{ ne .Env.ENABLE_RELEASE_PIPELINE "true" }}'
6060
extra_files:
6161
- glob: 'operator-controller.yaml'
6262
header: |

Makefile

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ export IMAGE_REPO ?= quay.io/operator-framework/operator-controller
66
export IMAGE_TAG ?= devel
77
export GO_BUILD_TAGS ?= upstream
88
export CERT_MGR_VERSION ?= v1.9.0
9-
export GORELEASER_VERSION ?= v1.15.2
9+
export GORELEASER_VERSION ?= v1.16.2
1010
export WAIT_TIMEOUT ?= 60s
1111
IMG?=$(IMAGE_REPO):$(IMAGE_TAG)
1212

@@ -95,7 +95,7 @@ kind-cluster-cleanup: kind ## Delete the kind cluster
9595
##@ Build
9696

9797
.PHONY: build
98-
build: manifests generate fmt vet substitute goreleaser ## Build manager binary using goreleaser for current GOOS and GOARCH.
98+
build: manifests generate fmt vet goreleaser ## Build manager binary using goreleaser for current GOOS and GOARCH.
9999
${GORELEASER} build ${GORELEASER_ARGS} --single-target -o bin/manager
100100

101101
.PHONY: run
@@ -135,13 +135,10 @@ docker-buildx: test ## Build and push docker image for the manager for cross-pla
135135
###########
136136

137137
##@ Release:
138-
export DISABLE_RELEASE_PIPELINE ?= true
139-
export GORELEASER_ARGS ?= --snapshot --rm-dist
138+
export ENABLE_RELEASE_PIPELINE ?= false
139+
export GORELEASER_ARGS ?= --snapshot --clean
140140

141-
substitute:
142-
envsubst < .goreleaser.template.yml > .goreleaser.yml
143-
144-
release: substitute goreleaser ## Runs goreleaser for the operator-controller. By default, this will run only as a snapshot and will not publish any artifacts unless it is run with different arguments. To override the arguments, run with "GORELEASER_ARGS=...". When run as a github action from a tag, this target will publish a full release.
141+
release: goreleaser ## Runs goreleaser for the operator-controller. By default, this will run only as a snapshot and will not publish any artifacts unless it is run with different arguments. To override the arguments, run with "GORELEASER_ARGS=...". When run as a github action from a tag, this target will publish a full release.
145142
$(GORELEASER) $(GORELEASER_ARGS)
146143

147144
quickstart: VERSION ?= $(shell git describe --abbrev=0 --tags)

0 commit comments

Comments
 (0)