Skip to content

Commit a33d89d

Browse files
committed
ayufan: ci: fix release version
Change-Id: I8318e69d144149c1696d9252e5072b5a068d30e6
1 parent 39caa9d commit a33d89d

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

.gitlab-ci.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ build:
2323
- |
2424
set -x
2525
26-
export RELEASE_NAME="$(./dev-make version)"
27-
export RELEASE_TITLE="$(./dev-make version)"
26+
export RELEASE_NAME="$(./dev-make version BOARD_TARGET=rock64)"
27+
export RELEASE_TITLE="$(./dev-make version BOARD_TARGET=rock64)"
2828
export DESCRIPTION="$CI_PROJECT_URL/pipelines/$CI_PIPELINE_ID"
2929
3030
github-release release \
@@ -34,14 +34,12 @@ build:
3434
--target "${CI_COMMIT_SHA}" \
3535
--draft
3636
37-
pushd ../
3837
for i in *.deb *.img.xz; do
3938
github-release upload \
4039
--tag "${RELEASE_NAME}" \
4140
--name "${i}" \
4241
--file "${i}"
4342
done
44-
popd
4543
4644
github-release edit \
4745
--tag "${RELEASE_NAME}" \

dev.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ RELEASE_NAME ?= $(shell $(UBOOT_MAKE) -s ubootrelease)
1212

1313
.PHONY: .scmversion
1414
.scmversion:
15-
@echo "~$(RELEASE)-rockchip-ayufan-g$$(git rev-parse --short HEAD)" > .scmversion
15+
@echo "-rockchip-ayufan-$(RELEASE)-g$$(git rev-parse --short HEAD)" > .scmversion
1616

1717
version: .scmversion
1818
@echo $(RELEASE_NAME)

0 commit comments

Comments
 (0)