Skip to content

Commit fabb5ce

Browse files
committed
[build] display progress and mvn coloring consistently
1 parent 334abef commit fabb5ce

2 files changed

Lines changed: 6 additions & 7 deletions

File tree

.github/workflows/maven.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
cache: maven
3636

3737
- name: Build with Maven
38-
run: ./mvnw -B install -Djruby.test.version=${{ matrix.jruby_version }}
38+
run: ./mvnw -ntp install -Dstyle.color=always -Djruby.test.version=${{ matrix.jruby_version }}
3939
env:
4040
RACK_VERSION: ${{ matrix.rack_version }}
4141

Rakefile

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@ directory 'target/classes'
3838

3939
desc "Compile classes"
4040
task(:compile => 'target/classes') do
41-
sh "./mvnw compile"
41+
sh "./mvnw -ntp -Dstyle.color=always compile"
4242
end
4343

4444
directory 'target/test-classes'
4545

4646
desc "Compile test classes"
4747
task(:test_prepare => ['target/classes', 'target/test-classes']) do
48-
sh "./mvnw test-compile"
48+
sh "./mvnw -ntp -Dstyle.color=always test-compile"
4949
end
5050

5151
desc "Unpack the rack gem"
@@ -88,7 +88,7 @@ task :test_resources => ["target/test-classes"]
8888
namespace :resources do
8989
desc "Copy (and generate) resources"
9090
task :copy => :resources do
91-
sh './mvnw process-resources -Dmdep.skip=true'
91+
sh './mvnw -ntp process-resources -Dstyle.color=always -Dmdep.skip=true'
9292
end
9393
desc "Generate test resources"
9494
task :test => :test_resources
@@ -198,8 +198,7 @@ task :release_checks do
198198
" git push origin :#{GEM_VERSION}" if ok
199199
end
200200

201-
pom_version = `./mvnw help:evaluate -Dexpression=project.version`.
202-
split("\n").reject { |line| line =~ /[INFO]/ }.first.chomp
201+
pom_version = `./mvnw help:evaluate -q --non-recursive -DforceStdout -Dexpression=project.version`
203202
if pom_version =~ /dev|SNAPSHOT/
204203
fail "Can't release a dev/snapshot version.\n" +
205204
"Please update pom.xml to the final release version, run `mvn install', and commit the result."
@@ -219,7 +218,7 @@ task :release => [:release_checks, :clean] do
219218
args = ''
220219
args << "-Dgpg.keyname=#{ENV['GPG_KEYNAME']} " if ENV['GPG_KEYNAME']
221220

222-
sh "./mvnw -Prelease #{args} -DupdateReleaseInfo=true clean deploy"
221+
sh "./mvnw -ntp -Prelease #{args} -Dstyle.color=always -DupdateReleaseInfo=true clean deploy"
223222

224223
sh "git tag #{GEM_VERSION}"
225224

0 commit comments

Comments
 (0)