Skip to content

Commit

Permalink
Remove danger from CI rake task (#3510)
Browse files Browse the repository at this point in the history
  • Loading branch information
omgitsbillryan authored Nov 6, 2019
1 parent 358afb0 commit 8485bfb
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 29 deletions.
13 changes: 9 additions & 4 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,7 @@ pipeline {

stage('Run tests') {
steps {
withCredentials([
string(credentialsId: 'sidekiq-enterprise-license', variable: 'BUNDLE_ENTERPRISE__CONTRIBSYS__COM'),
string(credentialsId: 'danger-github-api-token', variable: 'DANGER_GITHUB_API_TOKEN')
]) {
withCredentials([string(credentialsId: 'sidekiq-enterprise-license', variable: 'BUNDLE_ENTERPRISE__CONTRIBSYS__COM')]) {
withEnv(['RAILS_ENV=test', 'CI=true']) {
sh 'make ci'
}
Expand All @@ -46,6 +43,14 @@ pipeline {
}
}

stage('Run Danger Bot') {
steps {
withCredentials([string(credentialsId: 'danger-github-api-token', variable: 'DANGER_GITHUB_API_TOKEN')]) {
sh 'make danger'
}
}
}

stage('Review') {
when { not { branch 'master' } }

Expand Down
4 changes: 4 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ clean:
console:
@$(BASH_DEV) "bundle exec rails c"

.PHONY: danger
danger:
@$(BASH_TEST) "bundle exec danger --verbose"

.PHONY: db
db:
@$(BASH_DEV) "bin/rails db:setup db:migrate"
Expand Down
2 changes: 1 addition & 1 deletion rakelib/ci.rake
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# frozen_string_literal: true

desc 'Runs the continuous integration scripts'
task ci: %i[lint security danger spec:with_codeclimate_coverage]
task ci: %i[lint security spec:with_codeclimate_coverage]

task default: :ci

Expand Down
24 changes: 0 additions & 24 deletions rakelib/danger.rake

This file was deleted.

0 comments on commit 8485bfb

Please sign in to comment.