From a33d89deb12fa0b3a138ffe2b5879925433042fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Trzci=C5=84ski?= <ayufan@ayufan.eu>
Date: Thu, 5 Jul 2018 21:46:03 +0200
Subject: [PATCH] ayufan: ci: fix release version

Change-Id: I8318e69d144149c1696d9252e5072b5a068d30e6
---
 .gitlab-ci.yml | 6 ++----
 dev.mk         | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 353c0b274bc..3ab9a7a78f3 100644
--- 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
index d6a99b3683e..011ba3048e2 100644
--- 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)