moved build name details to make

johnjones4 · Apr 13, 2021 · 62e43a2 · 62e43a2
1 parent 30fa5c6
commit 62e43a2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/.github/workflows/build-test-dashboard.yml b/.github/workflows/build-test-dashboard.yml
@@ -22,8 +22,7 @@ jobs:
         cd dashboard
         make install
         make test
-        make suffix="$RUNNER_OS" build
-        env
+        make build
     - name: Publish Artifacts
       uses: softprops/action-gh-release@v1
       if: startsWith(github.ref, 'refs/tags/')

diff --git a/dashboard/Makefile b/dashboard/Makefile
@@ -1,5 +1,8 @@
 .PHONY: generate_test_data run
 
+OS=$(shell uname)
+ARCH=$(shell arch)
+
 install:
 	GOPATH=$(shell pwd) go get github.com/johnjones4/termui
 	GOPATH=$(shell pwd) go get github.com/johnjones4/termui/widgets
@@ -13,7 +16,7 @@ generate_test_data:
 	GOPATH=$(shell pwd) go run generate_test_data/generate_test_data.go $(file) > data/data.txt
 
 build:
-	GOPATH=$(shell pwd) go build -o build/dashboard-$(suffix) .
+	GOPATH=$(shell pwd) go build -o build/dashboard-$(OS)-$(ARCH) .
 
 test:
 	GOPATH=$(shell pwd) go test .