From b5d39bc72b036555d729c9634696e41c24216259 Mon Sep 17 00:00:00 2001 From: Johan Ljunggren Date: Sat, 22 Sep 2018 17:38:42 +0200 Subject: [PATCH] Update to use template files (#24) --- .gitattributes | 2 ++ .vscode/settings.json | 3 ++- README.md | 3 +++ appveyor.yml | 17 +++++++++++++---- 4 files changed, 20 insertions(+), 5 deletions(-) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..5613d53 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +# Needed for publishing of examples, build worker defaults to core.autocrlf=input. +* text eol=crlf diff --git a/.vscode/settings.json b/.vscode/settings.json index 87c4308..0969e57 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -9,5 +9,6 @@ "powershell.codeFormatting.ignoreOneLineBlock": false, "powershell.codeFormatting.preset": "Custom", "files.trimTrailingWhitespace": true, - "files.insertFinalNewline": true + "files.insertFinalNewline": true, + "powershell.scriptAnalysis.settingsPath": ".vscode\\analyzersettings.psd1" } diff --git a/README.md b/README.md index e0f3aa6..28d479c 100644 --- a/README.md +++ b/README.md @@ -121,6 +121,9 @@ Defaults to false. ### Unreleased +* Update appveyor.yml to use the default template. +* Added default template files .gitattributes, and .vscode settings. + ### 1.2.0.0 * Converted appveyor.yml to install Pester from PSGallery instead of from Chocolatey. diff --git a/appveyor.yml b/appveyor.yml index a940b19..452a96d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -3,10 +3,14 @@ #---------------------------------# version: 1.1.{build}.0 +environment: + gallery_api: + secure: 9ekJzfsPCDBkyLrfmov83XbbhZ6E2N3z+B/Io8NbDetbHc6hWS19zsDmy7t0Vvxv + install: - git clone https://github.com/PowerShell/DscResource.Tests - ps: Write-Verbose -Message "PowerShell version $($PSVersionTable.PSVersion)" -Verbose - - ps: Import-Module "$env:APPVEYOR_BUILD_FOLDER\DscResource.Tests\AppVeyor.psm1" + - ps: Import-Module -Name "$env:APPVEYOR_BUILD_FOLDER\DscResource.Tests\AppVeyor.psm1" - ps: Invoke-AppveyorInstallTask #---------------------------------# @@ -23,11 +27,16 @@ test_script: - ps: | Invoke-AppveyorTestScriptTask -CodeCoverage -CodeCovIo +# scripts to run before deployment +after_test: + - ps: | + Import-Module -Name "$env:APPVEYOR_BUILD_FOLDER\DscResource.Tests\AppVeyor.psm1" + Invoke-AppveyorAfterTestTask + #---------------------------------# # deployment configuration # #---------------------------------# -# scripts to run before deployment deploy_script: - - ps: | - Invoke-AppveyorAfterTestTask + - ps: | + Invoke-AppVeyorDeployTask