Commit 9d182df92ea262d085a3099517b92b2de57c2b6f
1 parent
c28342d6
Exists in
master
and in
29 other branches
Updating release script
Showing
1 changed file
with
10 additions
and
6 deletions
Show diff stats
lib/tasks/release.rake
@@ -41,7 +41,7 @@ namespace :noosfero do | @@ -41,7 +41,7 @@ namespace :noosfero do | ||
41 | end | 41 | end |
42 | 42 | ||
43 | def version | 43 | def version |
44 | - require_dependency 'noosfero' | 44 | + require 'noosfero' |
45 | Noosfero::VERSION | 45 | Noosfero::VERSION |
46 | end | 46 | end |
47 | 47 | ||
@@ -135,7 +135,7 @@ EOF | @@ -135,7 +135,7 @@ EOF | ||
135 | next if File.exist?("tmp/pending-release") | 135 | next if File.exist?("tmp/pending-release") |
136 | release_kind = args[:release_kind] || 'stable' | 136 | release_kind = args[:release_kind] || 'stable' |
137 | 137 | ||
138 | - if release_kind == 'test' | 138 | + if release_kind =~ /test/ |
139 | version_question = "Release candidate of which version" | 139 | version_question = "Release candidate of which version" |
140 | distribution = 'squeeze-test' | 140 | distribution = 'squeeze-test' |
141 | else | 141 | else |
@@ -145,7 +145,7 @@ EOF | @@ -145,7 +145,7 @@ EOF | ||
145 | 145 | ||
146 | version_name = new_version = ask(version_question) | 146 | version_name = new_version = ask(version_question) |
147 | 147 | ||
148 | - if release_kind == 'test' | 148 | + if release_kind =~ /test/ |
149 | rc_version = ask('RC version', Time.now.strftime('%Y%m%d%H%M%S')) | 149 | rc_version = ask('RC version', Time.now.strftime('%Y%m%d%H%M%S')) |
150 | version_name += "~rc#{rc_version}" | 150 | version_name += "~rc#{rc_version}" |
151 | end | 151 | end |
@@ -177,9 +177,13 @@ EOF | @@ -177,9 +177,13 @@ EOF | ||
177 | next if File.exist?("tmp/pending-release") | 177 | next if File.exist?("tmp/pending-release") |
178 | release_kind = args[:release_kind] || 'stable' | 178 | release_kind = args[:release_kind] || 'stable' |
179 | 179 | ||
180 | - if release_kind == 'test' | 180 | + if release_kind =~ /test/ |
181 | version_question = "Release candidate of which version: " | 181 | version_question = "Release candidate of which version: " |
182 | - distribution = 'squeeze-test' | 182 | + if release_kind == 'squeeze-test' |
183 | + distribution = 'squeeze-test' | ||
184 | + elsif release_kind == 'wheezy-test' | ||
185 | + distribution = 'wheezy-test' | ||
186 | + end | ||
183 | else | 187 | else |
184 | version_question = "Version that is being released: " | 188 | version_question = "Version that is being released: " |
185 | distribution = 'unstable' | 189 | distribution = 'unstable' |
@@ -187,7 +191,7 @@ EOF | @@ -187,7 +191,7 @@ EOF | ||
187 | 191 | ||
188 | version_name = new_version = ask(version_question) | 192 | version_name = new_version = ask(version_question) |
189 | 193 | ||
190 | - if release_kind == 'test' | 194 | + if release_kind =~ /test/ |
191 | timestamp = Time.now.strftime('%Y%m%d%H%M%S') | 195 | timestamp = Time.now.strftime('%Y%m%d%H%M%S') |
192 | version_name += "~rc#{timestamp}" | 196 | version_name += "~rc#{timestamp}" |
193 | end | 197 | end |