-
Notifications
You must be signed in to change notification settings - Fork 110
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
APP-6785: Remove local control page (RC) #4520
Open
ethanlookpotts
wants to merge
1
commit into
main
Choose a base branch
from
APP-6785/ethanlookpotts/remove-rc
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -17,7 +17,7 @@ default: build lint server | |
setup: | ||
bash etc/setup.sh | ||
|
||
build: build-web build-go | ||
build: build-go | ||
|
||
build-go: | ||
go build ./... | ||
|
@@ -37,14 +37,6 @@ cli-ci: bin/$(GOOS)-$(GOARCH)/viam-cli | |
cp $< bin/deploy-ci/viam-cli-$(CI_RELEASE)-$(GOOS)-$(GOARCH)$(EXE_SUFFIX); \ | ||
fi | ||
|
||
build-web: web/runtime-shared/static/control.js | ||
|
||
# only generate static files when source has changed. | ||
web/runtime-shared/static/control.js: web/frontend/src/*/* web/frontend/src/*/*/* web/frontend/src/*.* web/frontend/scripts/* web/frontend/*.* | ||
rm -rf web/runtime-shared/static | ||
npm ci --audit=false --prefix web/frontend | ||
npm run build-prod --prefix web/frontend | ||
|
||
tool-install: | ||
GOBIN=`pwd`/$(TOOL_BIN) go install \ | ||
github.com/edaniels/golinters/cmd/combined \ | ||
|
@@ -55,7 +47,7 @@ tool-install: | |
github.com/rhysd/actionlint/cmd/actionlint \ | ||
golang.org/x/tools/cmd/stringer | ||
|
||
lint: lint-go lint-web | ||
lint: lint-go | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I could collapse |
||
PATH=$(PATH_WITH_TOOLS) actionlint | ||
|
||
generate-go: tool-install | ||
|
@@ -66,47 +58,26 @@ lint-go: tool-install | |
export pkgs="`go list -f '{{.Dir}}' ./... | grep -v /proto/`" && echo "$$pkgs" | xargs go vet -vettool=$(TOOL_BIN)/combined | ||
GOGC=50 $(TOOL_BIN)/golangci-lint run -v --fix --config=./etc/.golangci.yaml | ||
|
||
lint-web: check-web | ||
npm run lint --prefix web/frontend | ||
|
||
check-web: build-web | ||
npm run check --prefix web/frontend | ||
|
||
cover-only: tool-install | ||
PATH=$(PATH_WITH_TOOLS) ./etc/test.sh cover | ||
|
||
cover: test-go cover-only | ||
|
||
test: test-go test-web | ||
|
||
test-no-race: test-go-no-race test-web | ||
|
||
test-go: tool-install | ||
PATH=$(PATH_WITH_TOOLS) ./etc/test.sh race | ||
|
||
test-go-no-race: tool-install | ||
PATH=$(PATH_WITH_TOOLS) ./etc/test.sh | ||
|
||
test-web: | ||
npm run test:unit --prefix web/frontend | ||
|
||
test-e2e: | ||
go build $(LDFLAGS) -o bin/test-e2e/server web/cmd/server/main.go | ||
./etc/e2e.sh -o 'run' $(E2E_ARGS) | ||
|
||
open-cypress-ui: | ||
go build $(LDFLAGS) -o bin/test-e2e/server web/cmd/server/main.go | ||
./etc/e2e.sh -o 'open' | ||
|
||
server: build-web | ||
server: | ||
rm -f $(BIN_OUTPUT_PATH)/viam-server | ||
go build $(LDFLAGS) -o $(BIN_OUTPUT_PATH)/viam-server web/cmd/server/main.go | ||
|
||
server-static: build-web | ||
server-static: | ||
rm -f $(BIN_OUTPUT_PATH)/viam-server | ||
VIAM_STATIC_BUILD=1 GOFLAGS=$(GOFLAGS) go build $(LDFLAGS) -o $(BIN_OUTPUT_PATH)/viam-server web/cmd/server/main.go | ||
|
||
full-static: build-web | ||
full-static: | ||
mkdir -p bin/static | ||
go build -tags no_cgo,osusergo,netgo -ldflags="-extldflags=-static $(COMMON_LDFLAGS)" -o bin/static/viam-server-$(shell go env GOARCH) ./web/cmd/server | ||
|
||
|
@@ -117,7 +88,7 @@ clean-all: | |
git clean -fxd | ||
|
||
license-check: | ||
license_finder --npm-options='--prefix web/frontend' | ||
license_finder | ||
|
||
FFMPEG_ROOT ?= etc/FFmpeg | ||
$(FFMPEG_ROOT): | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I could collapse
build-go
intobuild
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think it's fine this way. I just double checked the proposed makefile with the current github action workflows (to the degree grepping for "make" and "build"/"test" gets what I need).
Github actions are directly using build-go and test-go. So if you go ahead with this change:
make build-go
.make build
will be "go-less". Butmake {lint,test,generate}
will have "go-ful" versions that github actions use.