appveyor skip commit workaround (#175)

* allow for PR to have green build status after CI commits

* Update appveyor.yml

* fix env variable refs

* fix tests

* CI produced files

* Update skip_ci_commit.ps1

* CI produced files

* Update appveyor.yml

* CI produced files

Co-authored-by: Appveyor <appveyor@lowlydba.com>

Author: lowlydba

appveyor/appveyor.yml

@@ -4,14 +4,15 @@ pull_requests:
   do_not_increment_build_number: false
 max_jobs: 2
 build: off
-skip_commits:
-  author: Appveyor
+# skip_commits:
+#   author: Appveyor
 
 environment:
   access_token:
     secure: 'E5I+i+CQyj9EHusDrPSQKHRXmzmpTujYAoFxlvJjvSRSEQHHzqTBIFR1VuPbwLMi'
   AZURE_SQL_PASS:
     secure: 'rYm3nE1kwpbdE7QtyLb8CjvA1ENjY3usz3Qqskf1TXU='
+  CI_COMMIT_MSG: 'CI produced files'
 
   APPVEYOR_RDP_PASSWORD: Np^VNSzJI5#OmRdUNqro2T9UVkCdZ
   TARGET_DB: tSQLt
@@ -66,6 +67,7 @@ clone_script:
   - git config --global core.safecrlf false
   - git clone -q --single-branch --branch=%APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH% https://github.com/LowlyDBA/dba-multitool.git %APPVEYOR_BUILD_FOLDER%
   - cd %APPVEYOR_BUILD_FOLDER%
+  - ps: .\appveyor\skip_ci_commit.ps1
 
 install:
   - ps: Install-Product node ''
@@ -92,12 +94,10 @@ for:
   test_script:
     - ps: .\appveyor\run_pester_tests.ps1 -CodeCoverage
 
-  # Build markdown w/ sp_doc
+  # Build markdown with sp_doc
+  # Upload code coverage report, push generated files
   after_test:
     - ps: .\appveyor\generate_sample_markdown.ps1
-
-  # Upload code coverage report, push generated files
-  on_success:
     - codecov -f %COV_REPORT%
     - ps: .\appveyor\push_git_changes.ps1
 

appveyor/push_git_changes.ps1

@@ -6,6 +6,6 @@ $StagedFiles = git diff --staged
 
 # Commit & push if stated
 If ($StagedFiles) {
-    git commit -a -m "CI produced files" -q
+    git commit -a -m $env:CI_COMMIT_MSG -q
     git push origin $env:APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH -f -q
 }

appveyor/run_pester_tests.ps1

@@ -23,14 +23,15 @@ $TestFiles = Get-ChildItem -Path .\tests\*.Tests.ps1
 $FailedTests = 0
 
 function Start-CodeCoverage {
-param(
-    [string]$SqlInstance,
-    [string]$Database,
-    [string]$User,
-    [string]$Pass,
-    [bool]$IsAzureSQL,
-    [System.ConsoleColor]$Color
-)
+    param(
+        [string]$SqlInstance,
+        [string]$Database,
+        [string]$User,
+        [string]$Pass,
+        [bool]$IsAzureSQL,
+        [System.ConsoleColor]$Color
+    )
+
     # Setup vars
     $ConnString = "server=$SqlInstance;initial catalog=$Database;Trusted_Connection=yes"
     If ($IsAzureSQL) {
@@ -52,10 +53,10 @@ param(
 }
 
 function Complete-CodeCoverage {
-param (
-    [string]$CoverageXMLPath,
-    [string]$Color
-)
+    param (
+        [string]$CoverageXMLPath,
+        [string]$Color
+    )
     # Stop covering
     Write-Host "Stopping SQLCover..." -ForegroundColor $Color
     $coverageResults = $global:SQLCover.Stop()

appveyor/skip_ci_commit.ps1

@@ -0,0 +1,5 @@
+# Exit build with success if commit is just files generated from CI
+If ($env:APPVEYOR_REPO_COMMIT_MESSAGE -eq $env:CI_COMMIT_MSG) {
+    Write-Output "Commit is CI produced files only. Skipping build."
+    Exit-AppveyorBuild
+}

appveyor/sqlcover/Coverage.opencoverxml

@@ -21,7 +21,7 @@ sp_estindex - Estimate a new index's size and statistics.
 
 Part of the DBA MultiTool http://dba-multitool.org
 
-Version: 20201109
+Version: 2020121
 
 MIT License
 

appveyor/sqlcover/[dbo].[sp_estindex]

@@ -2,7 +2,7 @@
 
 | Property | Value |
 | --- | --- |
-| Created On | Dec 10 2020 10:05PM |
+| Created On | Dec 11 2020 11:46PM |
 | SQL Server Version | 15.0.2000.5 |
 | Compatibility Level | 130 |
 | Collation | Latin1_General_100_CI_AS |

docs/assets/WideWorldImporters.md

@@ -1361,7 +1361,7 @@ sp_estindex - Estimate a new index's size and statistics.
 
 Part of the DBA MultiTool http://dba-multitool.org
 
-Version: 20201109
+Version: 2020121
 
 MIT License
 

install_dba-multitool.sql

@@ -101,7 +101,7 @@ sp_estindex - Estimate a new index's size and statistics.
 
 Part of the DBA MultiTool http://dba-multitool.org
 
-Version: 20201109
+Version: 2020121
 
 MIT License
 

sp_estindex.sql

@@ -39,7 +39,7 @@ Describe "sp_doc" {
             }
         }
         It "All tests" {
-                { Invoke-DbaQuery @Hash -Query $RunTestQuery } | Should -Not -Throw -Because "tSQLt unit tests must pass"
+            { Invoke-DbaQuery @Hash -Query $RunTestQuery } | Should -Not -Throw -Because "tSQLt unit tests must pass"
         }
     }
 }