arcad/edge
15
0
Fork 0
Code Issues 8 Pull Requests Projects Releases 3 Wiki Activity

fix(ci): update sdk test app version correctly
Some checks failed
arcad/edge/pipeline/head There was a failure building this commit
Details

Browse Source
This commit is contained in:
wpetit 2023-10-02 15:26:16 -06:00
parent 4fe68e335a
commit c4256e682a
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Jenkinsfile vendored
View File

@ -34,6 +34,7 @@ pipeline {
passwordVariable: 'GITEA_RELEASE_PASSWORD' passwordVariable: 'GITEA_RELEASE_PASSWORD'
]) ])
]) { ]) {
sh 'make .mktools'
sh 'make gitea-release' sh 'make gitea-release'
} }
} }

12
Makefile
View File

@ -83,7 +83,7 @@ run-storage-server: .env
.env: .env:
cp .env.dist .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 mkdir -p .gitea-release
rm -rf .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/ cp CHANGELOG.md .gitea-release/
# Create client-sdk-testsuite package # 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 bin/cli app package -d ./misc/client-sdk-testsuite/dist -o .gitea-release
GITEA_RELEASE_PROJECT="edge" \ GITEA_RELEASE_PROJECT="edge" \
GITEA_RELEASE_ORG="arcad" \ GITEA_RELEASE_ORG="arcad" \
GITEA_RELEASE_BASE_URL="https://forge.cadoles.com" \ GITEA_RELEASE_BASE_URL="https://forge.cadoles.com" \
GITEA_RELEASE_VERSION="$(MKT_PROJECT_VERSION)" \ GITEA_RELEASE_VERSION="$$MKT_PROJECT_VERSION" \
GITEA_RELEASE_NAME="$(MKT_PROJECT_VERSION)" \ GITEA_RELEASE_NAME="$$MKT_PROJECT_VERSION" \
GITEA_RELEASE_COMMITISH_TARGET="$$(git rev-parse HEAD)" \ GITEA_RELEASE_COMMITISH_TARGET="$$(git rev-parse HEAD)" \
GITEA_RELEASE_IS_DRAFT="false" \ GITEA_RELEASE_IS_DRAFT="false" \
GITEA_RELEASE_IS_PRERELEASE="true" \ GITEA_RELEASE_IS_PRERELEASE="true" \
@ -124,11 +124,11 @@ tools/modd/bin/modd:
.PHONY: goreleaser .PHONY: goreleaser
goreleaser: .env .mktools changelog 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 .PHONY: changelog
changelog: .mktools 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 .PHONY: mktools
mktools: mktools: