From 324640ca2eb5e0e7d29d9889070c0756ba3e9330 Mon Sep 17 00:00:00 2001 From: Mike Dalessio Date: Wed, 25 Nov 2020 16:03:57 -0500 Subject: [PATCH] ci: separate rubocop and test tasks; make default task do both --- Rakefile | 4 ++-- concourse/tasks/rake-test/run.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Rakefile b/Rakefile index f43d791c..90b20653 100644 --- a/Rakefile +++ b/Rakefile @@ -12,7 +12,6 @@ Rake::TestTask.new do |t| t.libs << "test" t.test_files = Dir["test/**/*.rb"] end -task :default => :test desc "generate safelists from W3C specifications" task :generate_safelists do @@ -26,7 +25,8 @@ end task :rubocop_frozen_string_literals do sh "rubocop lib --auto-correct --only Style/FrozenStringLiteralComment" end -Rake::Task[:test].prerequisites << :rubocop + +task :default => [:rubocop, :test] task :debug_manifest do spec = eval(File.read("loofah.gemspec")) diff --git a/concourse/tasks/rake-test/run.sh b/concourse/tasks/rake-test/run.sh index 43aa7f12..3d784474 100755 --- a/concourse/tasks/rake-test/run.sh +++ b/concourse/tasks/rake-test/run.sh @@ -9,6 +9,6 @@ pushd loofah # TODO: remove this once fefc629 (2019-11-25) is far enough in the past export RUBYOPT="--enable-frozen-string-literal --debug=frozen-string-literal" - bundle exec rake test + bundle exec rake popd