From f06d9941eeb69edd879a9c731f3975db7a9fe250 Mon Sep 17 00:00:00 2001 From: Wey Gu Date: Thu, 1 Dec 2022 07:07:44 +0000 Subject: [PATCH] parse githash from env during make --- .github/workflows/docker.yml | 2 +- Makefile | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 4b683f5..d1e8089 100644 --- 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 index 095229b..ae7e144 100644 --- 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}"