# HG changeset patch # User Jan Vrany # Date 1526397633 0 # Node ID 2aff5346b62cec06fcaef6b09f8b531b68ab2645 # Parent 85c4225068757766f8719dc5a3526a8d3337881a# Parent 9ba1d7cc7c61ae6b7e7bcd2a829a3234da6e5066 Merge diff -r 85c422506875 -r 2aff5346b62c ci/publish.groovy --- a/ci/publish.groovy Mon Apr 02 21:51:24 2018 +0000 +++ b/ci/publish.groovy Tue May 15 15:20:33 2018 +0000 @@ -4,7 +4,7 @@ pipeline { - agent any + agent { label 'linux' } parameters { string(name: 'job', description: 'Job whose artifacts to upload', defaultValue: 'stx_jv') diff -r 85c422506875 -r 2aff5346b62c ci/steps.groovy --- a/ci/steps.groovy Mon Apr 02 21:51:24 2018 +0000 +++ b/ci/steps.groovy Tue May 15 15:20:33 2018 +0000 @@ -116,8 +116,10 @@ * a need to build it itself */ artifacts(); - input(message: 'Publish artifacts?') - publish("8.0.0-rc") + println "Smalltalk/X built, job status is: ${currentBuild.result}" + if ( currentBuild.result == 'SUCCESS' ) { + publish("8.0.0-rc") + } } /* diff -r 85c422506875 -r 2aff5346b62c rakelib/hglib.rb --- a/rakelib/hglib.rb Mon Apr 02 21:51:24 2018 +0000 +++ b/rakelib/hglib.rb Tue May 15 15:20:33 2018 +0000 @@ -109,11 +109,11 @@ stdout, stderr, status = Open3.capture3(*cmd) case block.arity when 1 - STDOUT.print stdout - STDERR.print stderr + STDOUT.print stdout if defined? RakeFileUtils and RakeFileUtils.verbose + STDERR.print stderr if defined? RakeFileUtils and RakeFileUtils.verbose yield status when 2 - STDERR.print stderr + STDERR.print stderr if defined? RakeFileUtils and RakeFileUtils.verbose yield status, stdout when 3 yield status, stdout, stderr @@ -334,11 +334,31 @@ log = [] hg('log', rev: revset, template: template) do |status, out| if status.success? - puts out + puts out if defined? RakeFileUtils and RakeFileUtils.verbose log = out.split("\n") end end - log + return log + end + + def locate(revset = '.', pattern: '*') + files = [] + hg('locate', rev: revset, include: pattern) do |status, out| + if status.success? + files = out.split("\n") + end + end + return files + end + + # Return current branch name + def branch() + hg('branch') do | status, out | + if status.success? + return out.strip() + end + end + raise Exception.new("Failed to retrieve current branch") end # Return changeset IDs of all head revisions. diff -r 85c422506875 -r 2aff5346b62c specs/baseline.rbspec --- a/specs/baseline.rbspec Mon Apr 02 21:51:24 2018 +0000 +++ b/specs/baseline.rbspec Tue May 15 15:20:33 2018 +0000 @@ -30,6 +30,7 @@ package "stx:goodies/refactoryBrowser/browser" package "stx:libtool2" package "stx:goodies/libdbase" if not win32? + package "stx:goodies/fileformats/plist" application 'stx:projects/smalltalk'