Skip to content

Commit

Permalink
DnsServerDsc: Remove left-over debug code (#270)
Browse files Browse the repository at this point in the history
- DnsServerDsc
  - Removed left-over debug code.
  - Update to use the build worker `windows-latest` for the necessary stages
    of the pipeline, and `ubuntu-latest` for the other stages.
  - Update pipeline to use _GitVersion.Tool_ installed by `dotnet`.
  • Loading branch information
johlju authored Jan 10, 2023
1 parent 87db742 commit 85d00b4
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 20 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
public function `ConvertFrom-DscResourceInstance` (from _DscResource.Common_).
- Updated wiki start page with deprecation notice.
- Updated issue template for proposing a new resource.
- Removed left-over debug code.
- Update to use the build worker `windows-latest` for the necessary stages
of the pipeline, and `ubuntu-latest` for the other stages.
- Update pipeline to use _GitVersion.Tool_ installed by `dotnet`.

### Fixed

Expand Down
41 changes: 22 additions & 19 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,17 @@ stages:
- job: Package_Module
displayName: 'Package Module'
pool:
vmImage: 'ubuntu 16.04'
vmImage: 'windows-latest'
steps:
- task: GitVersion@5
name: gitVersion
displayName: 'Evaluate Next Version'
inputs:
runtime: 'core'
configFilePath: 'GitVersion.yml'
- pwsh: |
dotnet tool install --global GitVersion.Tool
$gitVersionObject = dotnet-gitversion | ConvertFrom-Json
$gitVersionObject.PSObject.Properties.ForEach{
Write-Host -Object "Setting Task Variable '$($_.Name)' with value '$($_.Value)'."
Write-Host -Object "##vso[task.setvariable variable=$($_.Name);]$($_.Value)"
}
Write-Host -Object "##vso[build.updatebuildnumber]$($gitVersionObject.FullSemVer)"
displayName: Calculate ModuleVersion (GitVersion)
- task: PowerShell@2
name: package
displayName: 'Build & Package Module'
Expand All @@ -38,9 +41,9 @@ stages:
arguments: '-ResolveDependency -tasks pack'
pwsh: true
env:
ModuleVersion: $(gitVersion.NuGetVersionV2)
ModuleVersion: $(NuGetVersionV2)
- task: PublishPipelineArtifact@1
displayName: 'Publish Pipeline Artifact'
displayName: 'Publish Build Artifact'
inputs:
targetPath: '$(buildFolderName)/'
artifact: $(buildArtifactName)
Expand All @@ -53,11 +56,11 @@ stages:
- job: Test_HQRM
displayName: 'HQRM'
pool:
vmImage: 'windows-2019'
vmImage: 'windows-latest'
timeoutInMinutes: 0
steps:
- task: DownloadPipelineArtifact@2
displayName: 'Download Pipeline Artifact'
displayName: 'Download Build Artifact'
inputs:
buildType: 'current'
artifactName: $(buildArtifactName)
Expand All @@ -80,11 +83,11 @@ stages:
- job: Test_Unit
displayName: 'Unit'
pool:
vmImage: 'windows-2019'
vmImage: 'windows-latest'
timeoutInMinutes: 0
steps:
- task: DownloadPipelineArtifact@2
displayName: 'Download Pipeline Artifact'
displayName: 'Download Build Artifact'
inputs:
buildType: 'current'
artifactName: $(buildArtifactName)
Expand Down Expand Up @@ -113,11 +116,11 @@ stages:
- job: Test_Integration
displayName: 'Integration'
pool:
vmImage: 'windows-2019'
vmImage: 'windows-latest'
timeoutInMinutes: 0
steps:
- task: DownloadPipelineArtifact@2
displayName: 'Download Pipeline Artifact'
displayName: 'Download Build Artifact'
inputs:
buildType: 'current'
artifactName: $(buildArtifactName)
Expand Down Expand Up @@ -152,7 +155,7 @@ stages:
displayName: 'Publish Code Coverage'
dependsOn: Test_Unit
pool:
vmImage: 'ubuntu 16.04'
vmImage: 'ubuntu-latest'
timeoutInMinutes: 0
steps:
- pwsh: |
Expand All @@ -162,7 +165,7 @@ stages:
name: dscBuildVariable
displayName: 'Set Environment Variables'
- task: DownloadPipelineArtifact@2
displayName: 'Download Pipeline Artifact'
displayName: 'Download Build Artifact'
inputs:
buildType: 'current'
artifactName: $(buildArtifactName)
Expand Down Expand Up @@ -198,10 +201,10 @@ stages:
- job: Deploy_Module
displayName: 'Deploy Module'
pool:
vmImage: 'ubuntu 16.04'
vmImage: 'ubuntu-latest'
steps:
- task: DownloadPipelineArtifact@2
displayName: 'Download Pipeline Artifact'
displayName: 'Download Build Artifact'
inputs:
buildType: 'current'
artifactName: $(buildArtifactName)
Expand Down
1 change: 0 additions & 1 deletion debug.ps1

This file was deleted.

0 comments on commit 85d00b4

Please sign in to comment.