upd ci,.,.d././

ii64 · Dec 17, 2020 · 89fb3c6 · 89fb3c6
1 parent a944164
commit 89fb3c6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -27,6 +27,7 @@ jobs:
       run: |
         mkdir build
         cd cli && sudo make && cd ..
+        export B_SHA_SUB="$(echo "$GITHUB_SHA" | cut -c1-8)"
         export B_CLIDIR="./cli"
         export B_CLINAME="$B_CLIDIR/tanem.go"
         export B_HEADERFILE="$B_CLIDIR/deps/include/."
@@ -39,10 +40,7 @@ jobs:
     - name: Build linux amd64
       run: |
         mkdir build/linux_amd64
-        export B_SHA_SUB="$(echo "$GITHUB_SHA" | cut -c1-8)"
-        export CGO_LDFLAGS="-X github.com/ii64/tanem/cmd.GIT_COMMIT=$B_SHA_SUB"
-        echo $CGO_LDFLAGS
-        GOOS=linux GOARCH=amd64 go build -x -v -o build/linux_amd64/tanem cli/tanem.go
+        GOOS=linux GOARCH=amd64 go build -x -v -ldflags "-X github.com/ii64/tanem/cmd.GIT_COMMIT=$B_SHA_SUB" -o build/linux_amd64/tanem cli/tanem.go
         zip -r ./tanem-linux-amd64.zip --junk-paths build/linux_amd64/*
         zip -r ./tanem-linux-amd64-lib.zip --junk-paths cli/deps/lib/*
 

diff --git a/cli/make.bat b/cli/make.bat
@@ -1,2 +1,2 @@
 @ECHO off
-go build -i -v -ldflags "-X github.com/ii64/tanem/cmd.GIT_COMMIT=local" tanem.go
+go build -i -v -ldflags "-X github.com/ii64/tanem/cmd.GIT_COMMIT=local -lpthread" tanem.go