From c4256e682aa80f534071960c7a29dbe9e64d9982 Mon Sep 17 00:00:00 2001 From: William Petit Date: Mon, 2 Oct 2023 15:26:16 -0600 Subject: [PATCH] fix(ci): update sdk test app version correctly --- Jenkinsfile | 1 + Makefile | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) 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..5bb3370 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/* @@ -93,14 +93,14 @@ gitea-release: tools/yq/bin/yq tools/gitea-release/bin/gitea-release.sh goreleas cp CHANGELOG.md .gitea-release/ # Create client-sdk-testsuite package - tools/yq/bin/yq -i '.version = "$(MKT_PROJECT_VERSION)"' ./misc/client-sdk-testsuite/dist/manifest.yml + tools/yq/bin/yq -i '.version = "$$MKT_PROJECT_VERSION"' ./misc/client-sdk-testsuite/dist/manifest.yml bin/cli app package -d ./misc/client-sdk-testsuite/dist -o .gitea-release GITEA_RELEASE_PROJECT="edge" \ GITEA_RELEASE_ORG="arcad" \ GITEA_RELEASE_BASE_URL="https://forge.cadoles.com" \ - GITEA_RELEASE_VERSION="$(MKT_PROJECT_VERSION)" \ - GITEA_RELEASE_NAME="$(MKT_PROJECT_VERSION)" \ + GITEA_RELEASE_VERSION="$$MKT_PROJECT_VERSION" \ + GITEA_RELEASE_NAME="$$MKT_PROJECT_VERSION" \ GITEA_RELEASE_COMMITISH_TARGET="$$(git rev-parse HEAD)" \ GITEA_RELEASE_IS_DRAFT="false" \ GITEA_RELEASE_IS_PRERELEASE="true" \ @@ -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: