whimsical-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject [whimsy] branch master updated: Use relative location so works with Travis etc
Date Fri, 25 Sep 2020 22:07:47 GMT
This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git


The following commit(s) were added to refs/heads/master by this push:
     new 8eb9522  Use relative location so works with Travis etc
8eb9522 is described below

commit 8eb9522912fb63a0e382ceba49e94e4518f0fa97
Author: Sebb <sebb@apache.org>
AuthorDate: Fri Sep 25 23:07:38 2020 +0100

    Use relative location so works with Travis etc
---
 Gemfile                         | 3 ++-
 lib/Gemfile                     | 3 ++-
 tools/Gemfile                   | 2 +-
 www/board/agenda/Gemfile        | 2 +-
 www/committers/Gemfile          | 2 +-
 www/members/Gemfile             | 2 +-
 www/roster/Gemfile              | 2 +-
 www/secretary/Gemfile           | 2 +-
 www/secretary/workbench/Gemfile | 2 +-
 www/status/Gemfile              | 2 +-
 www/treasurer/Gemfile           | 2 +-
 11 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/Gemfile b/Gemfile
index bf9d3af..19be44c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,7 @@
 source 'https://rubygems.org'
 
+root = '..'
 gemspec
 gem 'mime-types'
-wunderbar_version = File.read('/srv/whimsy/wunderbar.version').chomp
+wunderbar_version = File.read(File.expand_path("#{root}/wunderbar.version", __FILE__)).chomp
 gem 'wunderbar', wunderbar_version
diff --git a/lib/Gemfile b/lib/Gemfile
index 124d037..8d08e34 100644
--- a/lib/Gemfile
+++ b/lib/Gemfile
@@ -1,11 +1,12 @@
 source 'https://rubygems.org'
 
+root = '../..'
 # lib needs these at run-time
 gem 'json'
 gem 'nokogiri'
 gem 'rake'
 gem 'ruby-ldap'
-wunderbar_version = File.read('/srv/whimsy/wunderbar.version').chomp
+wunderbar_version = File.read(File.expand_path("#{root}/wunderbar.version", __FILE__)).chomp
 gem 'wunderbar', wunderbar_version
 gem 'pdf-reader'
 
diff --git a/tools/Gemfile b/tools/Gemfile
index b2c6c90..3ead2d9 100644
--- a/tools/Gemfile
+++ b/tools/Gemfile
@@ -5,5 +5,5 @@ asf_version = File.read(File.expand_path("#{root}/asf.version", __FILE__)).chomp
 gem 'whimsy-asf', asf_version, path: File.expand_path(root, __FILE__)
 
 gem 'builder'
-wunderbar_version = File.read('/srv/whimsy/wunderbar.version').chomp
+wunderbar_version = File.read(File.expand_path("#{root}/wunderbar.version", __FILE__)).chomp
 gem 'wunderbar', wunderbar_version
diff --git a/www/board/agenda/Gemfile b/www/board/agenda/Gemfile
index b6912ba..bdbf5af 100644
--- a/www/board/agenda/Gemfile
+++ b/www/board/agenda/Gemfile
@@ -12,7 +12,7 @@ else
 end
 
 gem 'rake'
-wunderbar_version = File.read('/srv/whimsy/wunderbar.version').chomp
+wunderbar_version = File.read(File.expand_path("#{root}/wunderbar.version", __FILE__)).chomp
 gem 'wunderbar', wunderbar_version
 gem 'ruby2js', '>= 3.2.0'
 gem 'sinatra', '~> 2.0'
diff --git a/www/committers/Gemfile b/www/committers/Gemfile
index fbbb26a..f09c350 100644
--- a/www/committers/Gemfile
+++ b/www/committers/Gemfile
@@ -5,5 +5,5 @@ asf_version = File.read(File.expand_path("#{root}/asf.version", __FILE__)).chomp
 gem 'whimsy-asf', asf_version, path: File.expand_path(root, __FILE__)
 
 gem 'escape'
-wunderbar_version = File.read('/srv/whimsy/wunderbar.version').chomp
+wunderbar_version = File.read(File.expand_path("#{root}/wunderbar.version", __FILE__)).chomp
 gem 'wunderbar', wunderbar_version
diff --git a/www/members/Gemfile b/www/members/Gemfile
index bd8e55b..b46d452 100644
--- a/www/members/Gemfile
+++ b/www/members/Gemfile
@@ -5,5 +5,5 @@ asf_version = File.read(File.expand_path("#{root}/asf.version", __FILE__)).chomp
 gem 'whimsy-asf', asf_version, path: File.expand_path(root, __FILE__)
 
 gem 'mail'
-wunderbar_version = File.read('/srv/whimsy/wunderbar.version').chomp
+wunderbar_version = File.read(File.expand_path("#{root}/wunderbar.version", __FILE__)).chomp
 gem 'wunderbar', wunderbar_version
diff --git a/www/roster/Gemfile b/www/roster/Gemfile
index 02984ec..cbb0675 100644
--- a/www/roster/Gemfile
+++ b/www/roster/Gemfile
@@ -13,7 +13,7 @@ else
 end
 
 gem 'rake'
-wunderbar_version = File.read('/srv/whimsy/wunderbar.version').chomp
+wunderbar_version = File.read(File.expand_path("#{root}/wunderbar.version", __FILE__)).chomp
 gem 'wunderbar', wunderbar_version
 gem 'ruby2js'
 gem 'sinatra', '~> 2.0'
diff --git a/www/secretary/Gemfile b/www/secretary/Gemfile
index 6fd120f..c317fd9 100644
--- a/www/secretary/Gemfile
+++ b/www/secretary/Gemfile
@@ -9,7 +9,7 @@ if File.exist? version_file
 end
 
 gem 'ruby2js', '>= 2.0.0'
-wunderbar_version = File.read('/srv/whimsy/wunderbar.version').chomp
+wunderbar_version = File.read(File.expand_path("#{root}/wunderbar.version", __FILE__)).chomp
 gem 'wunderbar', wunderbar_version
 gem 'mail'
 gem 'mime-types'
diff --git a/www/secretary/workbench/Gemfile b/www/secretary/workbench/Gemfile
index 25779ae..42a3d40 100644
--- a/www/secretary/workbench/Gemfile
+++ b/www/secretary/workbench/Gemfile
@@ -16,7 +16,7 @@ gem 'rake'
 gem 'zip'
 gem 'sinatra', '~> 2.0'
 gem 'sanitize'
-wunderbar_version = File.read('/srv/whimsy/wunderbar.version').chomp
+wunderbar_version = File.read(File.expand_path("#{root}/wunderbar.version", __FILE__)).chomp
 gem 'wunderbar', wunderbar_version
 gem 'ruby2js', '>= 2.1.18'
 gem 'execjs'
diff --git a/www/status/Gemfile b/www/status/Gemfile
index 305415e..df3cda7 100644
--- a/www/status/Gemfile
+++ b/www/status/Gemfile
@@ -7,5 +7,5 @@ gem 'whimsy-asf', asf_version, path: File.expand_path(root, __FILE__)
 gem 'passenger'
 
 gem 'mime-types'
-wunderbar_version = File.read('/srv/whimsy/wunderbar.version').chomp
+wunderbar_version = File.read(File.expand_path("#{root}/wunderbar.version", __FILE__)).chomp
 gem 'wunderbar', wunderbar_version
diff --git a/www/treasurer/Gemfile b/www/treasurer/Gemfile
index fbbb26a..f09c350 100644
--- a/www/treasurer/Gemfile
+++ b/www/treasurer/Gemfile
@@ -5,5 +5,5 @@ asf_version = File.read(File.expand_path("#{root}/asf.version", __FILE__)).chomp
 gem 'whimsy-asf', asf_version, path: File.expand_path(root, __FILE__)
 
 gem 'escape'
-wunderbar_version = File.read('/srv/whimsy/wunderbar.version').chomp
+wunderbar_version = File.read(File.expand_path("#{root}/wunderbar.version", __FILE__)).chomp
 gem 'wunderbar', wunderbar_version


Mime
View raw message