hu 1.4.7 → 1.4.8
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/lib/hu/deploy.rb +7 -7
- data/lib/hu/version.rb +1 -1
- 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: 92dd0aaf631fa4a14a664d49696d26fc1613e489
|
|
4
|
+
data.tar.gz: 84999b99f90adb521ff81b8ef1b5f8e81af8f3f7
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 355263087c8e741f45a931a7ff617f750efb3ff24b48f35b0795457c851d76feb930666b9406965b18a5b630bd4fb98a8d939045e7e2e2811b7f37476f483c7c
|
|
7
|
+
data.tar.gz: 74453615e00dfa216e2778540f80eb4aaca6a17826a49bfe94ec963696b7ae09b856d4b7198d39b0f9a234d0a858e18aee3251d72512cac04010c83958b47a9c
|
data/lib/hu/deploy.rb
CHANGED
|
@@ -149,13 +149,13 @@ module Hu
|
|
|
149
149
|
wc_update.join
|
|
150
150
|
unbusy
|
|
151
151
|
|
|
152
|
-
unless develop_can_be_merged_into_master?
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
end
|
|
152
|
+
# unless develop_can_be_merged_into_master?
|
|
153
|
+
# puts
|
|
154
|
+
# puts "ERROR: It seems like a merge of 'develop' into 'master' would fail.".color(:red)
|
|
155
|
+
# puts " Aborting early to prevent a merge conflict.".color(:red)
|
|
156
|
+
# puts
|
|
157
|
+
# exit 1
|
|
158
|
+
# end
|
|
159
159
|
|
|
160
160
|
highest_version = find_highest_version_tag
|
|
161
161
|
begin
|
data/lib/hu/version.rb
CHANGED