-
Notifications
You must be signed in to change notification settings - Fork 3.2k
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
build: on a dev branch automatically start the UI #4896
Merged
Merged
Conversation
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
Signed-off-by: Alex Collins <alex_collins@intuit.com>
Signed-off-by: Alex Collins <alex_collins@intuit.com>
Signed-off-by: Alex Collins <alex_collins@intuit.com>
Signed-off-by: Alex Collins <alex_collins@intuit.com>
Signed-off-by: Alex Collins <alex_collins@intuit.com>
Signed-off-by: Alex Collins <alex_collins@intuit.com>
Signed-off-by: Alex Collins <alex_collins@intuit.com>
Signed-off-by: Alex Collins <alex_collins@intuit.com>
Signed-off-by: Alex Collins <alex_collins@intuit.com>
Signed-off-by: Alex Collins <alex_collins@intuit.com>
Signed-off-by: Alex Collins <alex_collins@intuit.com>
alexec
changed the title
test: Refactor tests
build: on a dev machine automatically start the UI if you have yarn
Jan 17, 2021
Signed-off-by: Alex Collins <alex_collins@intuit.com>
Signed-off-by: Alex Collins <alex_collins@intuit.com>
alexec
changed the title
build: on a dev machine automatically start the UI if you have yarn
build: on a dev branch automatically start the UI
Jan 17, 2021
Signed-off-by: Alex Collins <alex_collins@intuit.com>
alexec
commented
Jan 17, 2021
Makefile
Outdated
@@ -14,6 +14,8 @@ GIT_REMOTE = origin | |||
GIT_BRANCH = $(shell git rev-parse --symbolic-full-name --verify --quiet --abbrev-ref HEAD) | |||
GIT_TAG = $(shell git describe --always --tags --abbrev=0 || echo untagged) | |||
GIT_TREE_STATE = $(shell if [ -z "`git status --porcelain`" ]; then echo "clean" ; else echo "dirty"; fi) | |||
# if we are on a dev branch | |||
DEV_BRANCH = $(shell [[ $(GIT_BRANCH) =~ 'master|release-.*' ]] && echo false || echo true) |
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.
Testing:
(⎈ |k3d-k3s-default:argo)➜ argo git:(ci) ✗ make --dry-run start GIT_BRANCH=release-1
echo "starting STATIC_FILES=true (DEV_BRANCH=false, GIT_BRANCH=release-1), AUTH_MODE=hybrid, RUN_MODE=local"
...
env DEFAULT_REQUEUE_TIME=2s SECURE=false ALWAYS_OFFLOAD_NODE_STATUS=false LOG_LEVEL=debug UPPERIO_DB_DEBUG=0 VERSION=latest AUTH_MODE=hybrid NAMESPACED=true NAMESPACE=argo /Users/acollins8/go/bin/goreman -set-ports=false -logtime=false start controller argo-server
(⎈ |k3d-k3s-default:argo)➜ argo git:(ci) ✗ make --dry-run start GIT_BRANCH=master
...
echo "starting STATIC_FILES=true (DEV_BRANCH=false, GIT_BRANCH=master), AUTH_MODE=hybrid, RUN_MODE=local"
...
env DEFAULT_REQUEUE_TIME=2s SECURE=false ALWAYS_OFFLOAD_NODE_STATUS=false LOG_LEVEL=debug UPPERIO_DB_DEBUG=0 VERSION=latest AUTH_MODE=hybrid NAMESPACED=true NAMESPACE=argo /Users/acollins8/go/bin/goreman -set-ports=false -logtime=false start controller argo-server
(⎈ |k3d-k3s-default:argo)➜ argo git:(ci) ✗ make --dry-run start GIT_BRANCH=dev
...
echo "starting STATIC_FILES=false (DEV_BRANCH=true, GIT_BRANCH=dev), AUTH_MODE=hybrid, RUN_MODE=local"
...
env DEFAULT_REQUEUE_TIME=2s SECURE=false ALWAYS_OFFLOAD_NODE_STATUS=false LOG_LEVEL=debug UPPERIO_DB_DEBUG=0 VERSION=latest AUTH_MODE=hybrid NAMESPACED=true NAMESPACE=argo /Users/acollins8/go/bin/goreman -set-ports=false -logtime=false start controller argo-server ui
Signed-off-by: Alex Collins <alex_collins@intuit.com>
simster7
approved these changes
Jan 18, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Signed-off-by: Alex Collins alex_collins@intuit.com
make start
will automatically start the UI if you haveyarn
installedChecklist: