fix: get git-revision.txt when out of tree

Agoric · Aug 23, 2020 · 3275022 · 3275022
1 parent 19d0e13
commit 3275022
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -10,6 +10,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@master
+    - name: Save Git revision
+      run: git log -1 --format='%H' > packages/cosmic-swingset/lib/git-revision.txt
     - name: Build Go dependencies image
       uses: elgohr/Publish-Docker-Github-Action@master
       with:

diff --git a/packages/cosmic-swingset/Makefile b/packages/cosmic-swingset/Makefile
@@ -24,7 +24,7 @@ MOD_READONLY = # -mod=readonly
 
 NAME := $(shell sed -ne 's/.*"name": "\([^"]*\)".*/\1/p' package.json)
 VERSION := $(shell sed -ne 's/.*"version": "\([^"]*\)".*/\1/p' package.json)
-COMMIT := $(shell git log -1 --format='%H' || cat lib/git-revision.txt)
+COMMIT := $(shell git log -1 --format='%H' 2>/dev/null || cat lib/git-revision.txt)
 
 ldflags = \
 	-X github.com/cosmos/cosmos-sdk/version.Name=$(NAME) \