Skip to content
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 15 commits into from
Jan 18, 2021
Merged

Conversation

alexec
Copy link
Contributor

@alexec alexec commented Jan 17, 2021

Signed-off-by: Alex Collins alex_collins@intuit.com

  • on a dev machine make start will automatically start the UI if you have yarn installed
  • test refactoring

Checklist:

alexec added 11 commits January 15, 2021 16:43
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 alexec requested a review from simster7 January 17, 2021 18:58
@alexec 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 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>
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)
Copy link
Contributor Author

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>
@alexec alexec marked this pull request as ready for review January 17, 2021 21:09
@alexec alexec merged commit 0c5ebbb into argoproj:master Jan 18, 2021
@alexec alexec deleted the ci branch January 18, 2021 19:32
This was referenced Jan 19, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants