Repository: buildr Updated Branches: refs/heads/master c9a9fa44e -> e69785584
remove more SVN old tasks which are not required anymore Project: http://git-wip-us.apache.org/repos/asf/buildr/repo Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/e6978558 Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/e6978558 Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/e6978558 Branch: refs/heads/master Commit: e697855848d99e66758dcbf3fa5c09d2c49bca90 Parents: c9a9fa4 Author: Antoine Toulme <[email protected]> Authored: Mon Mar 28 22:40:56 2016 -0700 Committer: Antoine Toulme <[email protected]> Committed: Mon Mar 28 22:40:56 2016 -0700 ---------------------------------------------------------------------- rakelib/doc.rake | 22 ++-------------------- rakelib/release.rake | 9 ++++----- 2 files changed, 6 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/buildr/blob/e6978558/rakelib/doc.rake ---------------------------------------------------------------------- diff --git a/rakelib/doc.rake b/rakelib/doc.rake index e090c30..0cb611a 100644 --- a/rakelib/doc.rake +++ b/rakelib/doc.rake @@ -91,7 +91,7 @@ end # Publish prerequisites to Web site. desc "Publish complete web site" -task 'publish' => %w(site setup-local-site-svn) do +task 'publish' => %w(site) do puts "Uploading new site ..." sh 'rsync', '--progress', '--recursive', '--delete', '--exclude=.svn','_site/', 'site' task('publish-site-svn').invoke @@ -100,31 +100,13 @@ end # Update HTML + PDF documentation (but not rdoc, changelog etc.) desc "Publish non-release specific documentation to web site" -task 'publish-doc' => %w(buildr.pdf _site setup-local-site-svn) do +task 'publish-doc' => %w(buildr.pdf _site) do cp 'buildr.pdf', '_site' puts 'Uploading new site ...' sh 'rsync', '--progress', '--recursive', '_site/', 'site' # Note: no --delete - task('publish-site-svn').invoke puts 'Done' end -task 'publish-site-svn' do - cd 'site' - sh 'svn', 'add', '--force', '.' - cd '..' - sh 'svn', 'commit', 'site', '-m', 'Publish latest site' -end - -desc 'Checkout or update site to local directory' -task 'setup-local-site-svn' do - if File.exist?('site') - sh 'svn', 'up', 'site' - sh 'svn', 'revert', '--recursive', 'site' - else - sh 'svn', 'co', 'https://svn.apache.org/repos/asf/buildr/site', 'site' - end -end - rescue Exception => e # The doc tasks do not work on our CI infrastructure with jruby as the native libraries # are not compatible with version of the C++ library we are running there http://git-wip-us.apache.org/repos/asf/buildr/blob/e6978558/rakelib/release.rake ---------------------------------------------------------------------- diff --git a/rakelib/release.rake b/rakelib/release.rake index 91e369f..19cbb8e 100644 --- a/rakelib/release.rake +++ b/rakelib/release.rake @@ -13,16 +13,15 @@ # License for the specific language governing permissions and limitations under # the License. + desc 'Release the next version of buildr from existing staged repository' -task 'release' do |task, args| - user = args.user || ENV['user'] || `whoami` - +task 'release' do # First, we need to get all the staged files from Apache to _release. mkpath '_release' lambda do - url = "home.apache.org:~/public_html/#{spec.name}/#{spec.version}" + url = "people.apache.org:~/public_html/#{spec.name}/#{spec.version}" puts "Populating _release directory from #{url} ..." - sh "lftp -e \"mirror public_html/#{spec.name}/#{spec.version} _release/#{spec.version}; bye\" -u #{user} sftp://home.apache.org"; + sh 'rsync', '--progress', '--recursive', url, '_release' puts '[X] Staged files are now in _release' end.call
