Skip to content

Commit 4b01b8c

Browse files
committed
(test) added docker stage
1 parent 1e969cb commit 4b01b8c

File tree

5 files changed

+21
-24
lines changed

5 files changed

+21
-24
lines changed

.artifactignore

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,2 @@
11
**/*
2-
!**/*.cake
3-
!**/Dockerfile
4-
!build.ps1
5-
!build.config
6-
!*.yml
7-
!*.yaml
2+
!artifacts

azure-pipelines.yml

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
stages:
2-
- stage: Package
2+
- stage: Pack
33
jobs:
4-
- job: Package
4+
- job: Pack
55
strategy:
66
matrix:
77
'Windows':
@@ -13,12 +13,12 @@ stages:
1313
pool:
1414
vmImage: $(VM_IMAGE)
1515
steps:
16-
- template: build/tmpl/jobs.yml
16+
- template: build/stages/pack.yml
1717

18-
- stage: Dir
18+
- stage: Docker
1919
condition: succeeded()
2020
jobs:
21-
- job: Dir
21+
- job: Docker
2222
strategy:
2323
matrix:
2424
'Windows':
@@ -28,11 +28,4 @@ stages:
2828
pool:
2929
vmImage: $(VM_IMAGE)
3030
steps:
31-
- checkout: none
32-
- task: DownloadPipelineArtifact@2
33-
inputs:
34-
source: current
35-
path: $(Build.SourcesDirectory)
36-
artifact: artifacts
37-
- powershell: dir $(Build.SourcesDirectory); dir $(Build.SourcesDirectory)/build;
38-
displayName: 'Dir build'
31+
- template: build/stages/docker.yml

build/pack.cake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ Task("Test")
8383

8484
#endregion
8585

86-
#region Package
86+
#region Pack
8787

8888
Task("Copy-Files")
8989
.IsDependentOn("Test")

build/stages/docker.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
steps:
2+
- task: DownloadPipelineArtifact@2
3+
inputs:
4+
source: current
5+
path: $(Build.SourcesDirectory)
6+
artifact: artifacts
7+
- powershell: ./build.ps1 -script build.cake -target Docker-Test
8+
displayName: 'Docker build'
9+
env:
10+
DOCKER_USERNAME: $(DOCKER_USERNAME)
11+
DOCKER_PASSWORD: $(DOCKER_PASSWORD)
12+
ENABLED_PUBLISH_DOCKER: $(ENABLED_PUBLISH_DOCKER)

build/tmpl/jobs.yml renamed to build/stages/pack.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,9 @@ steps:
1212
versionSpec: '>= 2.5'
1313
addToPath: true # Optional
1414
- powershell: ./build.ps1 -script build.cake -target Pack
15-
displayName: 'Cake build'
15+
displayName: 'Cake build and Package'
1616
env:
1717
GITHUB_TOKEN: $(GITHUB_TOKEN)
18-
DOCKER_USERNAME: $(DOCKER_USERNAME)
19-
DOCKER_PASSWORD: $(DOCKER_PASSWORD)
2018
NUGET_API_KEY: $(NUGET_API_KEY)
2119
NUGET_API_URL: $(NUGET_API_URL)
2220
CHOCOLATEY_API_KEY: $(CHOCOLATEY_API_KEY)
@@ -29,7 +27,6 @@ steps:
2927
ENABLED_PUBLISH_TFS: $(ENABLED_PUBLISH_TFS)
3028
ENABLED_PUBLISH_NUGET: $(ENABLED_PUBLISH_NUGET)
3129
ENABLED_PUBLISH_CHOCOLATEY: $(ENABLED_PUBLISH_CHOCOLATEY)
32-
ENABLED_PUBLISH_DOCKER: $(ENABLED_PUBLISH_DOCKER)
3330
- publish: $(System.DefaultWorkingDirectory)
3431
condition: eq( variables['Agent.OS'], 'Windows_NT' )
3532
artifact: artifacts

0 commit comments

Comments
 (0)