Skip to content

Commit 076ce8c

Browse files
committed
update
1 parent 402a902 commit 076ce8c

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

.github/workflows/go.yml

+1-4
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@ jobs:
3030
cd cli && sudo make && cd ..
3131
export B_CLIDIR="./cli"
3232
export B_CLINAME="$B_CLIDIR/tanem.go"
33-
export B_CGO_CFLAGS="-I$B_CLIDIR/deps/include"
34-
export B_CGO_LDFLAGS="-L$B_CLIDIR/deps/lib -X github.com/ii64/tanem/cmd.GIT_COMMIT=$B_SHA_SUB"
33+
export CGO_LDFLAGS="-X github.com/ii64/tanem/cmd.GIT_COMMIT=$B_SHA_SUB"
3534
export B_HEADERFILE="$B_CLIDIR/deps/include/."
3635
export B_LIBSFILE="$B_CLIDIR/deps/lib/."
3736
sudo cp -a "$B_HEADERFILE" /usr/include
@@ -43,8 +42,6 @@ jobs:
4342
run: |
4443
mkdir build/linux_amd64
4544
cp -a "./cli/deps/lib" build/linux_amd64/lib
46-
export B_SHA_SUB="$(echo "$GITHUB_SHA" | cut -c1-8)"
47-
export CGO_LDFLAGS="-X github.com/ii64/tanem/cmd.GIT_COMMIT=$B_SHA_SUB"
4845
echo $CGO_LDFLAGS
4946
GOOS=linux GOARCH=amd64 go build -x -v -o build/linux_amd64/tanem cli/tanem.go
5047
zip -r ./tanem-linux-amd64.zip --junk-paths build/linux_amd64/*

cli/make.bat

+2-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
go build -i -v -x tanem.go
1+
@ECHO off
2+
go build -i -v -ldflags "-X github.com/ii64/tanem/cmd.GIT_COMMIT=local" tanem.go

0 commit comments

Comments
 (0)