wip

iotaledger · Nov 9, 2023 · 79f56f2 · 79f56f2
1 parent 7d8459a
commit 79f56f2
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 5 deletions.
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -127,12 +127,47 @@ jobs:
           go get -v -t -d ./...
 
       - name: macos arm64
-        run: GOOS=darwin GOARCH=arm64 make build-cli
+        run: |
+          GOOS=darwin GOARCH=arm64 make build-cli 
+          if [ -f wasp-cli ]; then
+            rm wasp-cli
+          else
+            echo "error: can't compile wasp-cli"
+            exit 1
+          fi
       - name: macos amd64
-        run: GOOS=darwin GOARCH=amd64 make build-cli
+        run: |
+          GOOS=darwin GOARCH=amd64 make build-cli 
+          if [ -f wasp-cli ]; then
+            rm wasp-cli
+          else
+            echo "error: can't compile wasp-cli"
+            exit 1
+          fi
       - name: linux arm64
-        run: GOOS=linux GOARCH=arm64 make build-cli
+        run: |
+          GOOS=linux GOARCH=arm64 make build-cli 
+          if [ -f wasp-cli ]; then
+            rm wasp-cli
+          else
+            echo "error: can't compile wasp-cli"
+            exit 1
+          fi
       - name: linux amd64
-        run: GOOS=linux GOARCH=amd64 make build-cli
+        run: |
+          GOOS=linux GOARCH=amd64 make build-cli 
+          if [ -f wasp-cli ]; then
+            rm wasp-cli
+          else
+            echo "error: can't compile wasp-cli"
+            exit 1
+          fi
       - name: windows amd64
-        run: GOOS=windows GOARCH=amd64 make build-cli
+        run: |
+          GOOS=windows GOARCH=amd64 make build-cli 
+          if [ -f wasp-cli ]; then
+            rm wasp-cli
+          else
+            echo "error: can't compile wasp-cli"
+            exit 1
+          fi
diff --git a/Makefile b/Makefile
@@ -1,10 +1,15 @@
 GIT_REF_TAG := $(shell git describe --tags)
 BUILD_TAGS = rocksdb
+ifdef OS
+# windows
+BUILD_LD_FLAGS = "-X=github.com/iotaledger/wasp/components/app.Version=$(GIT_REF_TAG)
+else
 ifeq ($(shell uname -m), arm64)
 BUILD_LD_FLAGS = "-X=github.com/iotaledger/wasp/components/app.Version=$(GIT_REF_TAG) -extldflags \"-Wa,--noexecstack\""
 else
 BUILD_LD_FLAGS = "-X=github.com/iotaledger/wasp/components/app.Version=$(GIT_REF_TAG) -extldflags \"-z noexecstack\""
 endif
+endif
 DOCKER_BUILD_ARGS = # E.g. make docker-build "DOCKER_BUILD_ARGS=--tag wasp:devel"
 
 #