diff --git a/Jenkinsfile b/Jenkinsfile index bbd67a0..c403520 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -34,6 +34,7 @@ pipeline { passwordVariable: 'GITEA_RELEASE_PASSWORD' ]) ]) { + sh 'make .mktools' sh 'make gitea-release' } } diff --git a/Makefile b/Makefile index 6cc219e..21a3d6c 100644 --- a/Makefile +++ b/Makefile @@ -83,7 +83,7 @@ run-storage-server: .env .env: cp .env.dist .env -gitea-release: tools/yq/bin/yq tools/gitea-release/bin/gitea-release.sh goreleaser build +gitea-release: .mktools tools/yq/bin/yq tools/gitea-release/bin/gitea-release.sh goreleaser build mkdir -p .gitea-release rm -rf .gitea-release/* @@ -124,11 +124,11 @@ tools/modd/bin/modd: .PHONY: goreleaser goreleaser: .env .mktools changelog - ( set -o allexport && source .env && set +o allexport && curl -sfL https://goreleaser.com/static/run | VERSION="$(GORELEASER_VERSION)" GORELEASER_CURRENT_TAG="$(MKT_PROJECT_VERSION)" bash /dev/stdin $(GORELEASER_ARGS) ) + ( set -o allexport && source .env && set +o allexport && curl -sfL https://goreleaser.com/static/run | VERSION="$(GORELEASER_VERSION)" GORELEASER_CURRENT_TAG="$$MKT_PROJECT_VERSION" bash /dev/stdin $(GORELEASER_ARGS) ) .PHONY: changelog changelog: .mktools - $(MAKE) MKT_GIT_CHGLOG_ARGS='--next-tag $$(MKT_PROJECT_VERSION) --tag-filter-pattern $$(MKT_PROJECT_VERSION_CHANNEL) --output CHANGELOG.md' mkt-changelog + $(MAKE) MKT_GIT_CHGLOG_ARGS='--next-tag "$(MKT_PROJECT_VERSION)" --tag-filter-pattern "$(MKT_PROJECT_VERSION_CHANNEL)" --output CHANGELOG.md' mkt-changelog .PHONY: mktools mktools: