Skip to content

Commit de4b35b

Browse files
authored
fix build and enable nuget generation from PRs (#129)
1 parent 1aee912 commit de4b35b

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

Build/azure-pipelines.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ stages:
4444
inputs:
4545
command: build
4646
projects: '$(solution)'
47-
configuration: '$(build_configuration)'
47+
arguments: '--configuration $(build_configuration)'
4848
displayName: Build Solution
4949

5050
- task: PublishPipelineArtifact@1
@@ -64,29 +64,26 @@ stages:
6464
############################
6565

6666
- powershell: echo "##vso[task.setvariable variable=packageVersion]$(packageVersion)-rc.$(Build.BuildId)"
67-
condition: eq(variables['Build.SourceBranchName'], 'master')
67+
condition: ne(variables['Build.SourceBranchName'], 'release')
6868
displayName: Update nuget version
6969

7070
- task: PowerShell@2
7171
inputs:
7272
filePath: '$(Build.SourcesDirectory)/Build/BuildNuspecs.ps1'
7373
workingDirectory: '$(Build.SourcesDirectory)'
7474
arguments: -path $(Build.SourcesDirectory)/Build/linq2db.LINQPad.nuspec -version $(packageVersion) -branch $(Build.SourceBranchName)
75-
condition: or (eq(variables['Build.SourceBranchName'], 'master'), eq(variables['Build.SourceBranchName'], 'release'))
7675
displayName: Update .nuspec
7776

7877
- task: NuGetCommand@2
7978
inputs:
8079
command: 'custom'
8180
arguments: 'pack "$(Build.SourcesDirectory)/Build/linq2db.LINQPad.nuspec" -OutputDirectory "$(Build.SourcesDirectory)/.build/nugets"'
82-
condition: or (eq(variables['Build.SourceBranchName'], 'master'), eq(variables['Build.SourceBranchName'], 'release'))
8381
displayName: Generate linq2db.LINQPad.nupkg
8482

8583
- task: PublishPipelineArtifact@1
8684
inputs:
8785
path: '$(Build.SourcesDirectory)/.build/nugets/'
8886
artifact: '$(artifact_nuget)'
89-
condition: or (eq(variables['Build.SourceBranchName'], 'master'), eq(variables['Build.SourceBranchName'], 'release'))
9087
displayName: Publish nuget to Artifacts
9188

9289
- task: NuGetCommand@2

Build/nuget-vars.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
variables:
22
${{ if eq(variables['Build.SourceBranchName'], 'release') }}:
33
packageVersion: $(nugetVersion)
4-
${{ if eq(variables['Build.SourceBranchName'], 'master') }}:
4+
${{ if ne(variables['Build.SourceBranchName'], 'release') }}:
55
packageVersion: $(nugetDevVersion)

0 commit comments

Comments
 (0)