From cc7291562e6dea91d8867eee81197cc27fdddf67 Mon Sep 17 00:00:00 2001 From: Syrus Akbary Date: Mon, 3 Dec 2018 18:53:48 -0800 Subject: [PATCH] Improved GIT_VERSION build checks --- .circleci/config.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 02a84494b..d49bbd8ba 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -51,7 +51,9 @@ jobs: make release mkdir -p artifacts VERSION=$(cargo pkgid | cut -d# -f2 | cut -d: -f2) + GIT_VERSION=$(git describe --exact-match --tags) echo "${VERSION}" >> artifacts/version + echo "${GIT_VERSION}" >> artifacts/git_version cp ./target/release/wasmer ./artifacts/$(./binary-name.sh) - persist_to_workspace: root: . @@ -141,7 +143,8 @@ jobs: VERSION=$(cat ./artifacts/version) rm ./artifacts/version # VERSION_TAG=${CIRCLE_TAG} - VERSION_TAG=$(git describe --exact-match --tags) + VERSION_TAG=$(cat ./artifacts/git_version) + # VERSION_TAG=$(git describe --exact-match --tags) if [ "$VERSION" == "$VERSION_TAG" ]; then echo "Versions match, publishing to Github" ghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} -delete ${VERSION} ./artifacts/