Skip to content

Commit 904f79c

Browse files
committed
Revert "(test) added docker stage"
This reverts commit 4b01b8c.
1 parent af9c19b commit 904f79c

File tree

5 files changed

+24
-21
lines changed

5 files changed

+24
-21
lines changed

.artifactignore

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

azure-pipelines.yml

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

18-
- stage: Docker
18+
- stage: Dir
1919
condition: succeeded()
2020
jobs:
21-
- job: Docker
21+
- job: Dir
2222
strategy:
2323
matrix:
2424
'Windows':
@@ -28,4 +28,11 @@ stages:
2828
pool:
2929
vmImage: $(VM_IMAGE)
3030
steps:
31-
- template: build/stages/docker.yml
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'

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 Pack
86+
#region Package
8787

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

build/stages/docker.yml

Lines changed: 0 additions & 12 deletions
This file was deleted.

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,11 @@ steps:
1212
versionSpec: '>= 2.5'
1313
addToPath: true # Optional
1414
- powershell: ./build.ps1 -script build.cake -target Pack
15-
displayName: 'Cake build and Package'
15+
displayName: 'Cake build'
1616
env:
1717
GITHUB_TOKEN: $(GITHUB_TOKEN)
18+
DOCKER_USERNAME: $(DOCKER_USERNAME)
19+
DOCKER_PASSWORD: $(DOCKER_PASSWORD)
1820
NUGET_API_KEY: $(NUGET_API_KEY)
1921
NUGET_API_URL: $(NUGET_API_URL)
2022
CHOCOLATEY_API_KEY: $(CHOCOLATEY_API_KEY)
@@ -27,6 +29,7 @@ steps:
2729
ENABLED_PUBLISH_TFS: $(ENABLED_PUBLISH_TFS)
2830
ENABLED_PUBLISH_NUGET: $(ENABLED_PUBLISH_NUGET)
2931
ENABLED_PUBLISH_CHOCOLATEY: $(ENABLED_PUBLISH_CHOCOLATEY)
32+
ENABLED_PUBLISH_DOCKER: $(ENABLED_PUBLISH_DOCKER)
3033
- publish: $(System.DefaultWorkingDirectory)
3134
condition: eq( variables['Agent.OS'], 'Windows_NT' )
3235
artifact: artifacts

0 commit comments

Comments
 (0)