Skip to content

Commit

Permalink
Merge pull request #16 from SubPointSolutions/dev
Browse files Browse the repository at this point in the history
0.1.0-beta6
  • Loading branch information
SubPointSupport authored Apr 4, 2017
2 parents bc69691 + 50b5c11 commit 936cd7b
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Build/build.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"customNuspecs": [
{
"Id": "SubPointSolutions.CakeBuildTools",
"Version": "0.1.0-beta5",
"Version": "0.1.0-beta6",
"Dependencies": [ ],
"LicenseUrl": "https://github.com/SubPointSolutions/CakeBuildTools/licence",
"ProjectUrl": "https://github.com/SubPointSolutions/CakeBuildTools",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1266,7 +1266,7 @@ var defaultActionDocsMerge = Task("Action-Docs-Merge")

var cloneCmd = new []{
string.Format("cd '{0}'", docsRepoFolder),
string.Format("git clone -b {1} {0}", docsRepoUrl, defaultDocsBranch)
string.Format("git clone -b {1} {0} --quiet > null 2>&1", docsRepoUrl, defaultDocsBranch)
};

StartPowershellScript(string.Join(Environment.NewLine, cloneCmd));
Expand All @@ -1277,8 +1277,8 @@ var defaultActionDocsMerge = Task("Action-Docs-Merge")
Information(string.Format("Checkout docs branch:[{0}]", defaultDocsBranch));
var checkoutCmd = new []{
string.Format("cd '{0}'", docsRepoFolder),
string.Format("git checkout {0}", defaultDocsBranch),
string.Format("git pull")
string.Format("git checkout {0} --quiet > null 2>&1", defaultDocsBranch),
string.Format("git pull --quiet > null 2>&1")
};

StartPowershellScript(string.Join(Environment.NewLine, checkoutCmd));
Expand Down Expand Up @@ -1324,7 +1324,7 @@ var defaultActionDocsMerge = Task("Action-Docs-Merge")
mergeCmd.Add(string.Format("git add {0} -f", defaultDocsFileExtension));
}

mergeCmd.Add(string.Format("git commit -m '{0}'", commitName));
mergeCmd.Add(string.Format("git commit -m '{0}' --quiet > null 2>&1", commitName));

StartPowershellScript(string.Join(Environment.NewLine, mergeCmd));

Expand All @@ -1333,7 +1333,8 @@ var defaultActionDocsMerge = Task("Action-Docs-Merge")
string.Format("cd '{0}'", docsRepoFolder),
string.Format("git config http.sslVerify false"),
string.Format("git config --global push.default simple"),
string.Format("git push {0}", docsRepoPushUrl)
string.Format("git push {0} --quiet > null 2>&1", docsRepoPushUrl),
string.Format("return $LASTEXITCODE")
};

// writing a temporary PS file to avoid creds exposure in the build output
Expand Down

0 comments on commit 936cd7b

Please sign in to comment.