ayufan: ci: fix release version

Change-Id: I8318e69d144149c1696d9252e5072b5a068d30e6
ayufan-rock64 · Jul 5, 2018 · a33d89d · a33d89d
1 parent 39caa9d
commit a33d89d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -23,8 +23,8 @@ build:
     - |
       set -x
 
-      export RELEASE_NAME="$(./dev-make version)"
-      export RELEASE_TITLE="$(./dev-make version)"
+      export RELEASE_NAME="$(./dev-make version BOARD_TARGET=rock64)"
+      export RELEASE_TITLE="$(./dev-make version BOARD_TARGET=rock64)"
       export DESCRIPTION="$CI_PROJECT_URL/pipelines/$CI_PIPELINE_ID"
 
       github-release release \
@@ -34,14 +34,12 @@ build:
         --target "${CI_COMMIT_SHA}" \
         --draft
 
-      pushd ../
       for i in *.deb *.img.xz; do
         github-release upload \
           --tag "${RELEASE_NAME}" \
           --name "${i}" \
           --file "${i}"
       done
-      popd
 
       github-release edit \
         --tag "${RELEASE_NAME}" \

diff --git a/dev.mk b/dev.mk
@@ -12,7 +12,7 @@ RELEASE_NAME ?= $(shell $(UBOOT_MAKE) -s ubootrelease)
 
 .PHONY: .scmversion
 .scmversion:
-	@echo "~$(RELEASE)-rockchip-ayufan-g$$(git rev-parse --short HEAD)" > .scmversion
+	@echo "-rockchip-ayufan-$(RELEASE)-g$$(git rev-parse --short HEAD)" > .scmversion
 
 version: .scmversion
 	@echo $(RELEASE_NAME)