origen 0.5.1 → 0.5.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/config/version.rb +1 -1
- data/lib/origen/application/release.rb +0 -10
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 2d6594b5eb4a34dbccfc4c76e9ed6c9f9b39ea60
|
|
4
|
+
data.tar.gz: e6f9c547255149d54f90040264ceccde321711cc
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 2901024fb0b33136675dfc80eb28effc84936eabe786ebe9efdfb30ce18e1ffd22097e105bd2cf517b18abf6bceb5ca617dc06e2750310d8564c4b200bf299df
|
|
7
|
+
data.tar.gz: a456becf6859f04ff24af820d2c9e6dab78b3782860fe9adee8de031e86f67e942c3498c1acc9611d047a2d7d7e120608c9f78f9929b8704af302e335f784160
|
data/config/version.rb
CHANGED
|
@@ -96,16 +96,6 @@ Your workspace has local modifications that are preventing the requested action
|
|
|
96
96
|
puts "Production releases can only be made on the master branch, your current branch is: #{Origen.app.rc.current_branch}"
|
|
97
97
|
exit 1
|
|
98
98
|
end
|
|
99
|
-
else
|
|
100
|
-
unless Origen.app.rc.current_branch == 'master'
|
|
101
|
-
puts "With Git you can only release onto the master branch, your current branch is: #{Origen.app.rc.current_branch}"
|
|
102
|
-
puts
|
|
103
|
-
puts 'If you want to use a Gitflow workflow you will be able to do development releases on the develop branch, to'
|
|
104
|
-
puts 'do that set config.rc_workflow = :gitflow in your config/application.rb'
|
|
105
|
-
puts
|
|
106
|
-
puts 'Otherwise, for release on a non-standard branch you will need to manage it yourself.'
|
|
107
|
-
exit 1
|
|
108
|
-
end
|
|
109
99
|
end
|
|
110
100
|
end
|
|
111
101
|
end
|