Skip to content

Commit 5489590

Browse files
committed
Simplify pipeline
1 parent aa1b9c2 commit 5489590

File tree

4 files changed

+41
-63
lines changed

4 files changed

+41
-63
lines changed

.azure/builds.yml

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

.azure/publish.yml

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

.azure/tests.yml

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,28 @@ parameters:
22
netcore1Global: true
33

44
steps:
5-
- template: builds.yml
5+
- task: DotNetCoreCLI@2
6+
displayName: dotnet build
7+
inputs:
8+
command: build
9+
projects: progaudi.tarantool.sln
10+
arguments: -c Release
11+
verbosityRestore: minimal
12+
13+
- task: Bash@3
14+
displayName: set version variable
15+
inputs:
16+
targetType: inline
17+
script: echo "##vso[task.setvariable variable=NugetPackageVersion]$(git describe --tags | sed 's/-/./')"
18+
19+
- task: DotNetCoreCLI@2
20+
displayName: pack nuget package
21+
inputs:
22+
command: pack
23+
versioningScheme: byEnvVar
24+
versionEnvVar: NugetPackageVersion
25+
arguments: --no-build -c Release /property:PackageOutputPath=$(Build.ArtifactStagingDirectory)
26+
verbosityPack: minimal
627

728
- task: Bash@3
829
inputs:

azure-pipelines.yml

Lines changed: 19 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,11 @@
11
jobs:
2-
- job: macOsBuild
2+
- job: macOs
33
pool:
44
name: Hosted macOS
55
steps:
6-
- template: .azure/builds.yml
7-
8-
- job: linuxBuild
9-
pool:
10-
name: Hosted Ubuntu 1604
11-
steps:
12-
- template: .azure/builds.yml
6+
- template: .azure/tests.yml
137

14-
- job: linuxTest
15-
dependsOn:
16-
- linuxBuild
8+
- job: linux
179
pool:
1810
name: Hosted Ubuntu 1604
1911
steps:
@@ -23,25 +15,25 @@ jobs:
2315
parameters:
2416
netcore1Global: false
2517

26-
- job: winBuild
27-
pool:
28-
name: Hosted VS2017
29-
steps:
30-
- template: .azure/builds.yml
31-
32-
- job: winTest
18+
- job: win
3319
dependsOn:
34-
- winBuild
20+
- macOs
21+
- linux
3522
pool:
3623
name: Hosted VS2017
3724
steps:
3825
- template: .azure/tests.yml
3926

40-
- job: pushToNuget
41-
dependsOn:
42-
- linuxTest
43-
- winTest
44-
pool:
45-
name: Hosted VS2017
46-
steps:
47-
- template: .azure/publish.yml
27+
- ${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
28+
- task: NuGetCommand@2
29+
displayName: push nuget packages
30+
inputs:
31+
command: push
32+
packagesToPush: '$(Build.ArtifactStagingDirectory)/*.nupkg'
33+
nuGetFeedType: external
34+
publishFeedCredentials: api.nuget.org
35+
36+
- task: PublishBuildArtifacts@1
37+
inputs:
38+
pathtoPublish: '$(Build.ArtifactStagingDirectory)'
39+
artifactName: nupkgs

0 commit comments

Comments
 (0)