forked from argoproj/argo-cd
-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' of https://github.com/argoproj/argo-cd into bug…
…s/rate-limit-failed-logins
- Loading branch information
Showing
80 changed files
with
2,781 additions
and
684 deletions.
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 |
|---|---|---|
|
|
@@ -44,6 +44,12 @@ commands: | |
| root: . | ||
| paths: | ||
| - coverage.out | ||
| save_node_modules: | ||
| steps: | ||
| - persist_to_workspace: | ||
| root: ~/argo-cd | ||
| paths: | ||
| - ui/node_modules | ||
| attach_vendor: | ||
| steps: | ||
| - attach_workspace: | ||
|
|
@@ -156,6 +162,35 @@ jobs: | |
| path: test-results | ||
| destination: . | ||
|
|
||
| lint: | ||
| working_directory: /go/src/github.com/argoproj/argo-cd | ||
| docker: | ||
| - image: argoproj/argocd-test-tools:v0.2.0 | ||
| steps: | ||
| - prepare_environment | ||
| - checkout | ||
| - configure_git | ||
| - restore_vendor | ||
| - run: dep ensure -v | ||
| - restore_go_cache_docker | ||
| - run: | ||
| name: Run golangci-lint | ||
| command: ARGOCD_LINT_GOGC=10 make lint-local | ||
| - run: | ||
| name: Check that nothing has changed | ||
| command: | | ||
| gDiff=$(git diff) | ||
| if test "$gDiff" != ""; then | ||
| echo | ||
| echo "###############################################################################" | ||
| echo "golangci-lint has made automatic corrections to your code. Please check below" | ||
| echo "diff output and commit this to your local branch, or run make lint locally." | ||
| echo "###############################################################################" | ||
| echo | ||
| git diff | ||
| exit 1 | ||
| fi | ||
| sonarcloud: | ||
| working_directory: /go/src/github.com/argoproj/argo-cd | ||
| docker: | ||
|
|
@@ -191,11 +226,16 @@ jobs: | |
| chmod +x $SCANNER_DIRECTORY/sonar-scanner-$VERSION-$OS/bin/sonar-scanner | ||
| chmod +x $SCANNER_DIRECTORY/sonar-scanner-$VERSION-$OS/jre/bin/java | ||
| # Workaround for a possible bug in CircleCI | ||
| if ! echo $CIRCLE_PULL_REQUEST | grep https://github.com/argoproj; then | ||
| unset CIRCLE_PULL_REQUEST | ||
| unset CIRCLE_PULL_REQUESTS | ||
| fi | ||
| # Explicitly set NODE_MODULES | ||
| export NODE_MODULES=/go/src/github.com/argoproj/argo-cd/ui/node_modules | ||
| export NODE_PATH=/go/src/github.com/argoproj/argo-cd/ui/node_modules | ||
| $SCANNER_DIRECTORY/sonar-scanner-$VERSION-$OS/bin/sonar-scanner | ||
| name: SonarCloud | ||
| - save_cache: | ||
|
|
@@ -296,6 +336,7 @@ jobs: | |
| - run: ./node_modules/.bin/codecov -p .. | ||
| - run: NODE_ENV='production' yarn build | ||
| - run: yarn lint | ||
| - save_node_modules | ||
|
|
||
| orbs: | ||
| sonarcloud: sonarsource/[email protected] | ||
|
|
@@ -314,10 +355,14 @@ workflows: | |
| - ui: | ||
| requires: | ||
| - build | ||
| - lint: | ||
| requires: | ||
| - build | ||
| - sonarcloud: | ||
| context: SonarCloud | ||
| requires: | ||
| - test | ||
| - ui | ||
| - e2e: | ||
| requires: | ||
| - build | ||
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
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
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
2 changes: 1 addition & 1 deletion
2
cmd/argocd-util/projects.go → cmd/argocd-util/commands/projects.go
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 |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| package main | ||
| package commands | ||
|
|
||
| import ( | ||
| "fmt" | ||
|
|
||
2 changes: 1 addition & 1 deletion
2
cmd/argocd-util/projects_test.go → cmd/argocd-util/commands/projects_test.go
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 |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| package main | ||
| package commands | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
Oops, something went wrong.