fixing build 3

johnjones4 · Oct 12, 2021 · b3e4284 · b3e4284
1 parent 966f358
commit b3e4284
Show file tree

Hide file tree

Showing 25 changed files with 25 additions and 2 deletions.
diff --git a/.github/workflows/build-test-dashboard.yml → .github/workflows/build-test-ground.yml b/.github/workflows/build-test-dashboard.yml → .github/workflows/build-test-ground.yml
@@ -21,7 +21,9 @@ jobs:
       run: |
         cd ground/dashboard
         make install
-        make test
+        make build
+        cd ../tool
+        make install
         make build
     - name: Publish Artifacts
       uses: softprops/action-gh-release@v1
@@ -31,3 +33,4 @@ jobs:
       with:
         files: |
           ./ground/dashboard/build/*
+          ./ground/tool/build/*
diff --git a/ground/dashboard/Makefile b/ground/dashboard/Makefile
@@ -11,7 +11,7 @@ run:
 	go run . $(source)
 
 build:
-	go build -o build/dashboard-$(OS)-$(ARCH) .
+	go build -o build/white-vest-dashboard-$(OS)-$(ARCH) .
 
 test:
 	go test .

diff --git a/ground/tool/Makefile b/ground/tool/Makefile
@@ -0,0 +1,20 @@
+.PHONY: generate_test_data run
+
+OS=$(shell uname)
+ARCH=$(shell arch)
+
+install:
+	go get ./...
+	go get -t ./...
+
+run:
+	go run . $(source)
+
+build:
+	go build -o build/white-vest-tools-$(OS)-$(ARCH) .
+
+test:
+	go test .
+
+clean:
+	rm -rf build
diff --git a/ground/reporter/charts/altitude.go → ground/tool/charts/altitude.go b/ground/reporter/charts/altitude.go → ground/tool/charts/altitude.go
diff --git a/ground/reporter/charts/types.go → ground/tool/charts/types.go b/ground/reporter/charts/types.go → ground/tool/charts/types.go
diff --git a/ground/reporter/charts/util.go → ground/tool/charts/util.go b/ground/reporter/charts/util.go → ground/tool/charts/util.go
diff --git a/ground/reporter/charts/velocity.go → ground/tool/charts/velocity.go b/ground/reporter/charts/velocity.go → ground/tool/charts/velocity.go
diff --git a/ground/reporter/conversion/inboard_reader.go → ground/tool/conversion/inboard_reader.go b/ground/reporter/conversion/inboard_reader.go → ground/tool/conversion/inboard_reader.go
diff --git a/ground/reporter/conversion/types.go → ground/tool/conversion/types.go b/ground/reporter/conversion/types.go → ground/tool/conversion/types.go
diff --git a/ground/reporter/go.mod → ground/tool/go.mod b/ground/reporter/go.mod → ground/tool/go.mod
diff --git a/ground/reporter/go.sum → ground/tool/go.sum b/ground/reporter/go.sum → ground/tool/go.sum
diff --git a/ground/reporter/main.go → ground/tool/main.go b/ground/reporter/main.go → ground/tool/main.go
diff --git a/ground/reporter/summerizers/altitude.go → ground/tool/summerizers/altitude.go b/ground/reporter/summerizers/altitude.go → ground/tool/summerizers/altitude.go
diff --git a/ground/reporter/summerizers/mode_time.go → ground/tool/summerizers/mode_time.go b/ground/reporter/summerizers/mode_time.go → ground/tool/summerizers/mode_time.go
diff --git a/ground/reporter/summerizers/origin.go → ground/tool/summerizers/origin.go b/ground/reporter/summerizers/origin.go → ground/tool/summerizers/origin.go
diff --git a/ground/reporter/summerizers/touchdown.go → ground/tool/summerizers/touchdown.go b/ground/reporter/summerizers/touchdown.go → ground/tool/summerizers/touchdown.go
diff --git a/ground/reporter/summerizers/travel.go → ground/tool/summerizers/travel.go b/ground/reporter/summerizers/travel.go → ground/tool/summerizers/travel.go
diff --git a/ground/reporter/summerizers/types.go → ground/tool/summerizers/types.go b/ground/reporter/summerizers/types.go → ground/tool/summerizers/types.go
diff --git a/ground/reporter/summerizers/util.go → ground/tool/summerizers/util.go b/ground/reporter/summerizers/util.go → ground/tool/summerizers/util.go
diff --git a/ground/reporter/summerizers/velocity.go → ground/tool/summerizers/velocity.go b/ground/reporter/summerizers/velocity.go → ground/tool/summerizers/velocity.go
diff --git a/ground/reporter/task_chart.go → ground/tool/task_chart.go b/ground/reporter/task_chart.go → ground/tool/task_chart.go
diff --git a/ground/reporter/task_convert.go → ground/tool/task_convert.go b/ground/reporter/task_convert.go → ground/tool/task_convert.go
diff --git a/ground/reporter/task_summary.go → ground/tool/task_summary.go b/ground/reporter/task_summary.go → ground/tool/task_summary.go
diff --git a/ground/reporter/types.go → ground/tool/types.go b/ground/reporter/types.go → ground/tool/types.go
diff --git a/ground/reporter/util.go → ground/tool/util.go b/ground/reporter/util.go → ground/tool/util.go