prima-twig 1.0.36 → 1.0.41
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/bin/twig-build +7 -9
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: ba12b8cd4fb77dd742eb407e132d8ae03e7290b10fb223952cbd257451e6a1b7
|
4
|
+
data.tar.gz: 3bf9981e8b81eacd7b46dd00350f436ac439609ed519a7b7d5735aec160a72de
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 1fd647aadda25d4bdd86960e4c5d2c28a43e88b9b64eb21310f6e520b1165a5a08beac15539231bced77fd46dcde1b5b2d8aea52bfe6f02cd37b2216997a528e
|
7
|
+
data.tar.gz: 48698bf449a09845b3e16e407a8f8657958d4f2ccb0c50dff897bd5833504da05aa25fd2152a97c8b199edf64dd504c02c241a508778510ee85e410790285867
|
data/bin/twig-build
CHANGED
@@ -1589,11 +1589,11 @@ class Build
|
|
1589
1589
|
},
|
1590
1590
|
{
|
1591
1591
|
parameter_key: "HostnamePattern",
|
1592
|
-
parameter_value: "carrozzerie
|
1592
|
+
parameter_value: "api-carrozzerie-#{get_deploy_id}.qa.colaster.com"
|
1593
1593
|
},
|
1594
1594
|
{
|
1595
1595
|
parameter_key: "HostnamePatternPriority",
|
1596
|
-
parameter_value:
|
1596
|
+
parameter_value: "2"
|
1597
1597
|
},
|
1598
1598
|
{
|
1599
1599
|
parameter_key: "AllowedOrigin",
|
@@ -1840,7 +1840,7 @@ projects_text.concat "
|
|
1840
1840
|
when project.include?('toretto_fe')
|
1841
1841
|
host = "carrozzerie-#{get_deploy_id}.qa.colaster.com"
|
1842
1842
|
when project.include?('toretto')
|
1843
|
-
host = "carrozzerie
|
1843
|
+
host = "api-carrozzerie-#{get_deploy_id}.qa.colaster.com"
|
1844
1844
|
end
|
1845
1845
|
host
|
1846
1846
|
end
|
@@ -2049,16 +2049,14 @@ projects_text.concat "
|
|
2049
2049
|
end
|
2050
2050
|
|
2051
2051
|
def deploy_vianello_or_domus?
|
2052
|
-
|
2053
|
-
|
2054
|
-
puts "check domus #{!@projects['domus'].empty?} #{@projects['domus'][:name] != 'master'} #{!@projects['domus'][:default_branch]}"
|
2055
|
-
domus_present = !@projects['domus'].empty? && @projects['domus'][:name] != 'master' && !@projects['domus'][:default_branch]
|
2052
|
+
vianello_present = !@projects['vianello'].empty? && @projects['vianello']['name'] != 'master' && !@projects['vianello']['default_branch']
|
2053
|
+
domus_present = !@projects['domus'].empty? && @projects['domus']['name'] != 'master' && !@projects['domus']['default_branch']
|
2056
2054
|
vianello_present || domus_present
|
2057
2055
|
end
|
2058
2056
|
|
2059
2057
|
def deploy_toretto?
|
2060
|
-
toretto_present = !@projects['toretto'].empty? && @projects['toretto'][
|
2061
|
-
crash_present = !@projects['crash'].empty? && @projects['crash'][
|
2058
|
+
toretto_present = !@projects['toretto'].empty? && @projects['toretto']['name'] != 'master' && !@projects['toretto']['default_branch']
|
2059
|
+
crash_present = !@projects['crash'].empty? && @projects['crash']['name'] != 'master' && !@projects['crash']['default_branch']
|
2062
2060
|
toretto_present || crash_present
|
2063
2061
|
end
|
2064
2062
|
|