parse githash from env during make

vesoft-inc · Dec 1, 2022 · f06d994 · f06d994
1 parent 5c80a61
commit f06d994
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -10,7 +10,7 @@ jobs:
     name: build docker image
     runs-on: ubuntu-latest
     steps:
-      - name: Set up QEMU        
+      - name: Set up QEMU
         uses: docker/setup-qemu-action@v1
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1

diff --git a/Makefile b/Makefile
@@ -2,7 +2,8 @@ name ?= nebula-console
 
 # build with verison infos
 buildDate = $(shell TZ=UTC date +%FT%T%z)
-gitCommit = $(shell git log --pretty=format:'%h' -1)
+gitCommit = ${GITHUB_SHA::7}
+gitCommit ?= $(shell git log --pretty=format:'%h' -1)
 
 ldflags="-w -X main.gitTag=${gitTag} -X main.buildDate=${buildDate} -X main.gitCommit=${gitCommit}"