Skip to content

Commit d253cb0

Browse files
Fix build pipelines (#1142)
* Use expression for testServer * Use runtime values * Revert "Use runtime values" This reverts commit 298bb31. * Don't use matrix
1 parent fd05485 commit d253cb0

File tree

2 files changed

+43
-27
lines changed

2 files changed

+43
-27
lines changed

builds/azure-pipelines/build-pr.yml

Lines changed: 40 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -9,41 +9,57 @@ pr:
99
variables:
1010
solution: '**/*.sln'
1111
configuration: 'Debug'
12+
nugetVersion: '99.99.99-test'
13+
binariesVersion: '99.99.99'
14+
oopWorkerSupportedExtensionVersion: '99.99.99-test'
1215

1316
stages:
1417
- stage: Build
1518
displayName: 'PR Validation'
1619

1720
jobs:
18-
- job: BuildTest
19-
displayName: 'Build and Test on'
20-
21-
# Verifies cross-platform build and test
22-
strategy:
23-
matrix:
24-
mac:
25-
imageName: 'macos-latest'
26-
testServer: ''
27-
windows:
28-
imageName: 'windows-latest'
29-
testServer: '(LocalDb)\MSSQLLocalDB'
30-
linux:
31-
imageName: 'ubuntu-latest'
32-
testServer: ''
33-
21+
- job: Mac
22+
timeoutInMinutes: 90
3423
pool:
35-
vmImage: '$(imageName)'
36-
24+
vmImage: macos-latest
25+
workspace:
26+
clean: all
27+
steps:
28+
- template: 'template-steps-build-test.yml'
29+
parameters:
30+
solution: '$(solution)'
31+
configuration: '$(configuration)'
32+
testServer: 'localhost'
33+
nugetVersion: '$(nugetVersion)'
34+
binariesVersion: '$(binariesVersion)'
35+
oopWorkerSupportedExtensionVersion: '$(oopWorkerSupportedExtensionVersion)'
36+
- job: Linux
37+
timeoutInMinutes: 90
38+
pool:
39+
vmImage: ubuntu-latest
40+
workspace:
41+
clean: all
42+
steps:
43+
- template: 'template-steps-build-test.yml'
44+
parameters:
45+
solution: '$(solution)'
46+
configuration: '$(configuration)'
47+
testServer: 'localhost'
48+
nugetVersion: '$(nugetVersion)'
49+
binariesVersion: '$(binariesVersion)'
50+
oopWorkerSupportedExtensionVersion: '$(oopWorkerSupportedExtensionVersion)'
51+
- job: Windows
52+
timeoutInMinutes: 90
53+
pool:
54+
vmImage: windows-latest
3755
workspace:
3856
clean: all
39-
40-
timeoutInMinutes: '90'
41-
4257
steps:
4358
- template: 'template-steps-build-test.yml'
4459
parameters:
4560
solution: '$(solution)'
4661
configuration: '$(configuration)'
47-
nugetVersion: '99.99.99-test'
48-
binariesVersion: '99.99.99'
49-
oopWorkerSupportedExtensionVersion: '99.99.99-test'
62+
testServer: '(LocalDb)\MSSQLLocalDB'
63+
nugetVersion: '$(nugetVersion)'
64+
binariesVersion: '$(binariesVersion)'
65+
oopWorkerSupportedExtensionVersion: '$(oopWorkerSupportedExtensionVersion)'

builds/azure-pipelines/template-steps-build-test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ steps:
146146
- task: DotNetCoreCLI@2
147147
displayName: '.NET Test on Mac (unit tests only)'
148148
env:
149-
TEST_SERVER: '$(testServer)'
149+
TEST_SERVER: ${{ parameters.testServer }}
150150
NODE_MODULES_PATH: '$(nodeModulesPath)'
151151
AZUREFUNCTIONS_SQLBINDINGS_TELEMETRY_OPTOUT: '1'
152152
inputs:
@@ -158,7 +158,7 @@ steps:
158158
- task: DotNetCoreCLI@2
159159
displayName: '.NET Test on Windows (unit tests and .NET In-Proc integration tests)'
160160
env:
161-
TEST_SERVER: '$(testServer)'
161+
TEST_SERVER: ${{ parameters.testServer }}
162162
NODE_MODULES_PATH: '$(nodeModulesPath)'
163163
AZUREFUNCTIONS_SQLBINDINGS_TELEMETRY_OPTOUT: '1'
164164
# Only running CSharp integration tests to get accurate code coverage numbers
@@ -174,7 +174,7 @@ steps:
174174
- task: DotNetCoreCLI@2
175175
displayName: '.NET Test on Windows (Non .NET In-Proc)'
176176
env:
177-
TEST_SERVER: '$(testServer)'
177+
TEST_SERVER: ${{ parameters.testServer }}
178178
NODE_MODULES_PATH: '$(nodeModulesPath)'
179179
AZUREFUNCTIONS_SQLBINDINGS_TELEMETRY_OPTOUT: '1'
180180
LANGUAGES_TO_TEST: 'Java,JavaScript,OutOfProc,PowerShell,Python,Csx'

0 commit comments

Comments
 (0)