From b3e42848045975b14ccd3ec37fd97b1a602fba42 Mon Sep 17 00:00:00 2001 From: John Jones Date: Tue, 12 Oct 2021 09:11:37 -0400 Subject: [PATCH] fixing build 3 --- ...st-dashboard.yml => build-test-ground.yml} | 5 ++++- ground/dashboard/Makefile | 2 +- ground/tool/Makefile | 20 +++++++++++++++++++ ground/{reporter => tool}/charts/altitude.go | 0 ground/{reporter => tool}/charts/types.go | 0 ground/{reporter => tool}/charts/util.go | 0 ground/{reporter => tool}/charts/velocity.go | 0 .../conversion/inboard_reader.go | 0 ground/{reporter => tool}/conversion/types.go | 0 ground/{reporter => tool}/go.mod | 0 ground/{reporter => tool}/go.sum | 0 ground/{reporter => tool}/main.go | 0 .../summerizers/altitude.go | 0 .../summerizers/mode_time.go | 0 .../{reporter => tool}/summerizers/origin.go | 0 .../summerizers/touchdown.go | 0 .../{reporter => tool}/summerizers/travel.go | 0 .../{reporter => tool}/summerizers/types.go | 0 ground/{reporter => tool}/summerizers/util.go | 0 .../summerizers/velocity.go | 0 ground/{reporter => tool}/task_chart.go | 0 ground/{reporter => tool}/task_convert.go | 0 ground/{reporter => tool}/task_summary.go | 0 ground/{reporter => tool}/types.go | 0 ground/{reporter => tool}/util.go | 0 25 files changed, 25 insertions(+), 2 deletions(-) rename .github/workflows/{build-test-dashboard.yml => build-test-ground.yml} (89%) create mode 100644 ground/tool/Makefile rename ground/{reporter => tool}/charts/altitude.go (100%) rename ground/{reporter => tool}/charts/types.go (100%) rename ground/{reporter => tool}/charts/util.go (100%) rename ground/{reporter => tool}/charts/velocity.go (100%) rename ground/{reporter => tool}/conversion/inboard_reader.go (100%) rename ground/{reporter => tool}/conversion/types.go (100%) rename ground/{reporter => tool}/go.mod (100%) rename ground/{reporter => tool}/go.sum (100%) rename ground/{reporter => tool}/main.go (100%) rename ground/{reporter => tool}/summerizers/altitude.go (100%) rename ground/{reporter => tool}/summerizers/mode_time.go (100%) rename ground/{reporter => tool}/summerizers/origin.go (100%) rename ground/{reporter => tool}/summerizers/touchdown.go (100%) rename ground/{reporter => tool}/summerizers/travel.go (100%) rename ground/{reporter => tool}/summerizers/types.go (100%) rename ground/{reporter => tool}/summerizers/util.go (100%) rename ground/{reporter => tool}/summerizers/velocity.go (100%) rename ground/{reporter => tool}/task_chart.go (100%) rename ground/{reporter => tool}/task_convert.go (100%) rename ground/{reporter => tool}/task_summary.go (100%) rename ground/{reporter => tool}/types.go (100%) rename ground/{reporter => tool}/util.go (100%) diff --git a/.github/workflows/build-test-dashboard.yml b/.github/workflows/build-test-ground.yml similarity index 89% rename from .github/workflows/build-test-dashboard.yml rename to .github/workflows/build-test-ground.yml index 6c296db..643b58b 100644 --- a/.github/workflows/build-test-dashboard.yml +++ b/.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 index 2929d26..c52167d 100644 --- 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 new file mode 100644 index 0000000..35366ba --- /dev/null +++ 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 b/ground/tool/charts/altitude.go similarity index 100% rename from ground/reporter/charts/altitude.go rename to ground/tool/charts/altitude.go diff --git a/ground/reporter/charts/types.go b/ground/tool/charts/types.go similarity index 100% rename from ground/reporter/charts/types.go rename to ground/tool/charts/types.go diff --git a/ground/reporter/charts/util.go b/ground/tool/charts/util.go similarity index 100% rename from ground/reporter/charts/util.go rename to ground/tool/charts/util.go diff --git a/ground/reporter/charts/velocity.go b/ground/tool/charts/velocity.go similarity index 100% rename from ground/reporter/charts/velocity.go rename to ground/tool/charts/velocity.go diff --git a/ground/reporter/conversion/inboard_reader.go b/ground/tool/conversion/inboard_reader.go similarity index 100% rename from ground/reporter/conversion/inboard_reader.go rename to ground/tool/conversion/inboard_reader.go diff --git a/ground/reporter/conversion/types.go b/ground/tool/conversion/types.go similarity index 100% rename from ground/reporter/conversion/types.go rename to ground/tool/conversion/types.go diff --git a/ground/reporter/go.mod b/ground/tool/go.mod similarity index 100% rename from ground/reporter/go.mod rename to ground/tool/go.mod diff --git a/ground/reporter/go.sum b/ground/tool/go.sum similarity index 100% rename from ground/reporter/go.sum rename to ground/tool/go.sum diff --git a/ground/reporter/main.go b/ground/tool/main.go similarity index 100% rename from ground/reporter/main.go rename to ground/tool/main.go diff --git a/ground/reporter/summerizers/altitude.go b/ground/tool/summerizers/altitude.go similarity index 100% rename from ground/reporter/summerizers/altitude.go rename to ground/tool/summerizers/altitude.go diff --git a/ground/reporter/summerizers/mode_time.go b/ground/tool/summerizers/mode_time.go similarity index 100% rename from ground/reporter/summerizers/mode_time.go rename to ground/tool/summerizers/mode_time.go diff --git a/ground/reporter/summerizers/origin.go b/ground/tool/summerizers/origin.go similarity index 100% rename from ground/reporter/summerizers/origin.go rename to ground/tool/summerizers/origin.go diff --git a/ground/reporter/summerizers/touchdown.go b/ground/tool/summerizers/touchdown.go similarity index 100% rename from ground/reporter/summerizers/touchdown.go rename to ground/tool/summerizers/touchdown.go diff --git a/ground/reporter/summerizers/travel.go b/ground/tool/summerizers/travel.go similarity index 100% rename from ground/reporter/summerizers/travel.go rename to ground/tool/summerizers/travel.go diff --git a/ground/reporter/summerizers/types.go b/ground/tool/summerizers/types.go similarity index 100% rename from ground/reporter/summerizers/types.go rename to ground/tool/summerizers/types.go diff --git a/ground/reporter/summerizers/util.go b/ground/tool/summerizers/util.go similarity index 100% rename from ground/reporter/summerizers/util.go rename to ground/tool/summerizers/util.go diff --git a/ground/reporter/summerizers/velocity.go b/ground/tool/summerizers/velocity.go similarity index 100% rename from ground/reporter/summerizers/velocity.go rename to ground/tool/summerizers/velocity.go diff --git a/ground/reporter/task_chart.go b/ground/tool/task_chart.go similarity index 100% rename from ground/reporter/task_chart.go rename to ground/tool/task_chart.go diff --git a/ground/reporter/task_convert.go b/ground/tool/task_convert.go similarity index 100% rename from ground/reporter/task_convert.go rename to ground/tool/task_convert.go diff --git a/ground/reporter/task_summary.go b/ground/tool/task_summary.go similarity index 100% rename from ground/reporter/task_summary.go rename to ground/tool/task_summary.go diff --git a/ground/reporter/types.go b/ground/tool/types.go similarity index 100% rename from ground/reporter/types.go rename to ground/tool/types.go diff --git a/ground/reporter/util.go b/ground/tool/util.go similarity index 100% rename from ground/reporter/util.go rename to ground/tool/util.go