Fix version displayed in UI when package is built by CI

clarin-eric · Nov 30, 2020 · c9606c4 · c9606c4
1 parent 04ac09e
commit c9606c4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -45,6 +45,8 @@ jobs:
         run: |
           make package
           cp build/switchboard.tar.gz build/switchboard-${{ needs.prepare.outputs.version }}.tar.gz
+        env:
+          CI_VERSION: ${{ needs.prepare.outputs.version }}
       - name: Upload build package
         uses: actions/upload-artifact@v2
         with:

diff --git a/Makefile b/Makefile
@@ -5,8 +5,8 @@ JSBUNDLE=$(WEBUIAPP)/bundle.js
 build-docker-image:
 	@GIT_COMMIT=$(shell git log -1 --pretty=format:"%H"|cut -c1-7) ;\
 	GIT_TAG=$(shell git describe --tags --abbrev=0) ;\
-	if [ ! -z "$${TRAVIS_TAG}" ]; then\
-		VERSION=$${TRAVIS_TAG} ;\
+	if [ ! -z "$${CI_VERSION}" ]; then\
+		VERSION=$${CI_VERSION} ;\
 	else\
 		VERSION=0.0.0 ;\
 		if [ ! -z $${GIT_TAG} ]; then\