Skip to content

Commit

Permalink
Fix azure condition
Browse files Browse the repository at this point in the history
  • Loading branch information
@theimowski
theimowski committed Aug 10, 2018
1 parent b9249b0 commit 2560024
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 15 deletions.
24 changes: 12 additions & 12 deletions Content/.template.config/template.json
View file
Expand Up @@ -119,62 +119,62 @@
"modifiers": [
{
"include": "paket_noazure_noremoting-nofulma_saturn-noremoting-noazure.lock",
"condition": "(server == \"saturn\" && remoting == false && deploy == \"none\" && layout == \"none\")",
"condition": "(server == \"saturn\" && remoting == false && deploy != \"azure\" && layout == \"none\")",
"rename": { "paket_noazure_noremoting-nofulma_saturn-noremoting-noazure.lock": "paket.lock" }
},
{
"include": "paket_noazure_noremoting-nofulma_giraffe-noremoting-noazure.lock",
"condition": "(server == \"giraffe\" && remoting == false && deploy == \"none\" && layout == \"none\")",
"condition": "(server == \"giraffe\" && remoting == false && deploy != \"azure\" && layout == \"none\")",
"rename": { "paket_noazure_noremoting-nofulma_giraffe-noremoting-noazure.lock": "paket.lock" }
},
{
"include": "paket_noazure_noremoting-nofulma_suave-noremoting-noazure.lock",
"condition": "(server == \"suave\" && remoting == false && deploy == \"none\" && layout == \"none\")",
"condition": "(server == \"suave\" && remoting == false && deploy != \"azure\" && layout == \"none\")",
"rename": { "paket_noazure_noremoting-nofulma_suave-noremoting-noazure.lock": "paket.lock" }
},
{
"include": "paket_noazure_remoting-nofulma_saturn-remoting-noazure.lock",
"condition": "(server == \"saturn\" && remoting == true && deploy == \"none\" && layout == \"none\")",
"condition": "(server == \"saturn\" && remoting == true && deploy != \"azure\" && layout == \"none\")",
"rename": { "paket_noazure_remoting-nofulma_saturn-remoting-noazure.lock": "paket.lock" }
},
{
"include": "paket_noazure_remoting-nofulma_giraffe-remoting-noazure.lock",
"condition": "(server == \"giraffe\" && remoting == true && deploy == \"none\" && layout == \"none\")",
"condition": "(server == \"giraffe\" && remoting == true && deploy != \"azure\" && layout == \"none\")",
"rename": { "paket_noazure_remoting-nofulma_giraffe-remoting-noazure.lock": "paket.lock" }
},
{
"include": "paket_noazure_remoting-nofulma_suave-remoting-noazure.lock",
"condition": "(server == \"suave\" && remoting == true && deploy == \"none\" && layout == \"none\")",
"condition": "(server == \"suave\" && remoting == true && deploy != \"azure\" && layout == \"none\")",
"rename": { "paket_noazure_remoting-nofulma_suave-remoting-noazure.lock": "paket.lock" }
},
{
"include": "paket_noazure_noremoting-fulma_saturn-noremoting-noazure.lock",
"condition": "(server == \"saturn\" && remoting == false && deploy == \"none\" && layout != \"none\")",
"condition": "(server == \"saturn\" && remoting == false && deploy != \"azure\" && layout != \"none\")",
"rename": { "paket_noazure_noremoting-fulma_saturn-noremoting-noazure.lock": "paket.lock" }
},
{
"include": "paket_noazure_noremoting-fulma_giraffe-noremoting-noazure.lock",
"condition": "(server == \"giraffe\" && remoting == false && deploy == \"none\" && layout != \"none\")",
"condition": "(server == \"giraffe\" && remoting == false && deploy != \"azure\" && layout != \"none\")",
"rename": { "paket_noazure_noremoting-fulma_giraffe-noremoting-noazure.lock": "paket.lock" }
},
{
"include": "paket_noazure_noremoting-fulma_suave-noremoting-noazure.lock",
"condition": "(server == \"suave\" && remoting == false && deploy == \"none\" && layout != \"none\")",
"condition": "(server == \"suave\" && remoting == false && deploy != \"azure\" && layout != \"none\")",
"rename": { "paket_noazure_noremoting-fulma_suave-noremoting-noazure.lock": "paket.lock" }
},
{
"include": "paket_noazure_remoting-fulma_saturn-remoting-noazure.lock",
"condition": "(server == \"saturn\" && remoting == true && deploy == \"none\" && layout != \"none\")",
"condition": "(server == \"saturn\" && remoting == true && deploy != \"azure\" && layout != \"none\")",
"rename": { "paket_noazure_remoting-fulma_saturn-remoting-noazure.lock": "paket.lock" }
},
{
"include": "paket_noazure_remoting-fulma_giraffe-remoting-noazure.lock",
"condition": "(server == \"giraffe\" && remoting == true && deploy == \"none\" && layout != \"none\")",
"condition": "(server == \"giraffe\" && remoting == true && deploy != \"azure\" && layout != \"none\")",
"rename": { "paket_noazure_remoting-fulma_giraffe-remoting-noazure.lock": "paket.lock" }
},
{
"include": "paket_noazure_remoting-fulma_suave-remoting-noazure.lock",
"condition": "(server == \"suave\" && remoting == true && deploy == \"none\" && layout != \"none\")",
"condition": "(server == \"suave\" && remoting == true && deploy != \"azure\" && layout != \"none\")",
"rename": { "paket_noazure_remoting-fulma_suave-remoting-noazure.lock": "paket.lock" }
},
{
Expand Down
6 changes: 3 additions & 3 deletions build.fsx
View file
Expand Up @@ -185,19 +185,19 @@ Target.create "GenJsonConditions" (fun _ ->
for config in configs do
let lockFileName = fullLockFileName config.ToBuild config.ToClient config.ToServer
let server = string config.Server
let deploy = if config.Azure then "azure" else "none"
let azureOperator = if config.Azure then "==" else "!="
let remoting = config.Remoting
let layoutOperator = if config.Fulma then "!=" else "=="
let template =
sprintf """ {
"include": "%s",
"condition": "(server == \"%s\" && remoting == %b && deploy == \"%s\" && layout %s \"none\")",
"condition": "(server == \"%s\" && remoting == %b && deploy %s \"azure\" && layout %s \"none\")",
"rename": { "%s": "paket.lock" }
},"""
lockFileName
server
remoting
deploy
azureOperator
layoutOperator
lockFileName

Expand Down

0 comments on commit 2560024

Please sign in to comment.