build: Updated Makefile to make goreman work (argoproj#8480)

Signed-off-by: mboussarov <[email protected]> Co-authored-by: mboussarov <[email protected]>
rohankmr414 · Apr 25, 2022 · e375764 · e375764
1 parent 0350e88
commit e375764
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-export SHELL:=/bin/bash
+
 export SHELLOPTS:=$(if $(SHELLOPTS),$(SHELLOPTS):)pipefail:errexit
 
 # https://stackoverflow.com/questions/4122831/disable-make-builtin-rules-and-variables-from-inside-the-make-file
@@ -462,7 +462,7 @@ pull-images:
  docker pull python:alpine3.6
 
 $(GOPATH)/bin/goreman:
- go install github.com/mattn/[email protected].7
+ go install github.com/mattn/[email protected].11
 
 .PHONY: start
 ifeq ($(RUN_MODE),local)
@@ -507,7 +507,7 @@ $(GOPATH)/bin/stern:
 
 .PHONY: logs
 logs: $(GOPATH)/bin/stern
- stern -l workflows.argoproj.io/workflow 2>&1
+ $(GOPATH)/bin/stern -l workflows.argoproj.io/workflow 2>&1
 
 .PHONY: wait
 wait:

diff --git a/go.mod b/go.mod
@@ -191,7 +191,7 @@ require (
  github.com/yudai/gojsondiff v1.0.0 // indirect
  github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 // indirect
  go.opencensus.io v0.23.0 // indirect
- golang.org/x/sys v0.0.0-20220412211240-33da011f77ad // indirect
+ golang.org/x/sys v0.0.0-20220422013727-9388b58f7150 // indirect
  golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
  golang.org/x/text v0.3.7 // indirect
  golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f // indirect

diff --git a/go.sum b/go.sum
@@ -1788,8 +1788,9 @@ golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220412211240-33da011f77ad h1:ntjMns5wyP/fN65tdBD4g8J5w8n015+iIIs9rtjXkY0=
 golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220422013727-9388b58f7150 h1:xHms4gcpe1YE7A3yIllJXP16CMAGuqwO2lX1mTyyRRc=
+golang.org/x/sys v0.0.0-20220422013727-9388b58f7150/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=

diff --git a/ui/.gitignore b/ui/.gitignore
@@ -2,4 +2,4 @@ node_modules
 dist
 bundle
 .vscode
-
+yarn-error.log