Updated build tools

nicholasdille · Sep 25, 2017 · 690ad25 · 690ad25
1 parent 136b455
commit 690ad25
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/Build/Start-Build.ps1 b/Build/Start-Build.ps1
@@ -6,7 +6,7 @@
 if (Get-NetAdapter | Where-Object Status -ieq 'Up') {
     # Install dependencies
     Get-PackageProvider -Name NuGet -ForceBootstrap | Out-Null
-    @('psake', 'PSDeploy', 'BuildHelpers', 'Pester', 'platyps', 'PSScriptAnalyzer', 'PSCoverage', 'CICD'<#, 'PSGitHub'#>) | ForEach-Object {
+    @('psake', 'PSDeploy', 'BuildHelpers', 'Pester', 'platyps', 'PSScriptAnalyzer', 'PSCoverage', 'CICD', 'PSGitHub') | ForEach-Object {
         if (-Not (Get-Module -ListAvailable -Name $_)) {
             "Installing module $_"
             Install-Module -Name $_ -Scope CurrentUser -AllowClobber -Force

diff --git a/Build/deploy.psdeploy.ps1 b/Build/deploy.psdeploy.ps1
@@ -86,11 +86,11 @@ if (
 
     "Creating release in GitHub repository" |
         Write-Host
-    $GitHubReleaseId = New-GitHubRelease -Owner $env:GitHubOwner -Repository $env:GitHubRepo -Token $env:GitHubToken -Name $env:ModuleVersion -Branch $env:BHBranchName -Body $ReleaseNotes
+    $GitHubReleaseId = CICD\New-GitHubRelease -Owner $env:GitHubOwner -Repository $env:GitHubRepo -Token $env:GitHubToken -Name $env:ModuleVersion -Branch $env:BHBranchName -Body $ReleaseNotes
 
     "Uploading asset to GitHub release" |
         Write-Host
-    $GitHubAssetId = New-GitHubReleaseAsset -Owner $env:GitHubOwner -Repository $env:GitHubRepo -Token $env:GitHubToken -Release $GitHubReleaseId -Path $AssetPath
+    $GitHubAssetId = CICD\New-GitHubReleaseAsset -Owner $env:GitHubOwner -Repository $env:GitHubRepo -Token $env:GitHubToken -Release $GitHubReleaseId -Path $AssetPath
 }
 else
 {

diff --git a/Build/psake.ps1 b/Build/psake.ps1
@@ -37,13 +37,13 @@ Task Analysis -Depends Init {
         return
     }
 
-    $Files = Get-ChildItem -Path "$env:BHModulePath\*.ps1" -File
-    $results = $Files | ForEach-Object { Invoke-ScriptAnalyzer -Path $_ -Severity Warning }
+    $results = Invoke-ScriptAnalyzer -Path $env:BHModulePath -Severity Error,Warning -Recurse
     if ($results) {
         $results | Select-Object -Property ScriptName,Line,RuleName,Severity,Message
         Write-Error 'Failed script analysis. Build failed.'
     }
-    $results = $Files | ForEach-Object { Invoke-ScriptAnalyzer -Path $_ -SuppressedOnly }
+
+    $results = Invoke-ScriptAnalyzer -Path $env:BHModulePath -SuppressedOnly -Recurse
     if ($results) {
         $results | Select-Object -Property ScriptName,Line,RuleName,Severity,Message,Justification
         Write-Warning 'Some issues are suppressed from script analysis.'