Skip to content

Commit

Permalink
Merge branch 'dev/jorobich/dartlab' of https://github.com/dotnet/roslyn
Browse files Browse the repository at this point in the history
… into dev/jorobich/dartlab
  • Loading branch information
Brad White committed Nov 19, 2021
2 parents 6fe4509 + c5f11d5 commit 2dc4985
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 10 deletions.
2 changes: 1 addition & 1 deletion azure-pipelines-integration-dartlab.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,4 @@ stages:
configuration: $(_configuration)
oop64bit: $(_oop64bit)
lspEditor: false
shallowCheckout: false
skipPipelinesCheckout: false
6 changes: 6 additions & 0 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,8 @@ jobs:
demands: ImageOverride -equals Build.Windows.Amd64.VS2022.Pre.Open
timeoutInMinutes: 90
steps:
- checkout: none

- template: eng/pipelines/checkout-windows-task.yml

- script: eng/test-determinism.cmd -configuration Debug
Expand All @@ -173,6 +175,8 @@ jobs:
demands: ImageOverride -equals Build.Windows.Amd64.VS2022.Pre.Open
timeoutInMinutes: 90
steps:
- checkout: none

- template: eng/pipelines/checkout-windows-task.yml

- script: eng/test-build-correctness.cmd -configuration Release -enableDumps
Expand Down Expand Up @@ -205,6 +209,8 @@ jobs:
demands: ImageOverride -equals Build.Windows.Amd64.VS2022.Pre.Open
timeoutInMinutes: 90
steps:
- checkout: none

- template: eng/pipelines/checkout-windows-task.yml

- task: PowerShell@2
Expand Down
2 changes: 2 additions & 0 deletions eng/pipelines/build-unix-job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ jobs:
timeoutInMinutes: 40

steps:
- checkout: none

- template: checkout-unix-task.yml

- script: ./eng/build.sh --ci --restore --prepareMachine --binaryLog --configuration ${{ parameters.configuration }}
Expand Down
6 changes: 4 additions & 2 deletions eng/pipelines/build-windows-job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ jobs:
timeoutInMinutes: 40

steps:
- checkout: none

- template: checkout-windows-task.yml

- task: PowerShell@2
Expand All @@ -39,13 +41,13 @@ jobs:
filePath: eng/build.ps1
arguments: -configuration ${{ parameters.configuration }} -prepareMachine -ci -restore -binaryLog

- task: PowerShell@2
- task: PowerShell@2
displayName: Build
inputs:
filePath: eng/build.ps1
arguments: -configuration ${{ parameters.configuration }} -prepareMachine -ci -build -publish -binaryLog -skipDocumentation ${{ parameters.buildArguments }}

- task: PowerShell@2
- task: PowerShell@2
displayName: Prepare Unit Tests
inputs:
filePath: eng/prepare-tests.ps1
Expand Down
2 changes: 0 additions & 2 deletions eng/pipelines/checkout-unix-task.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
# Shallow checkout sources on Unix
steps:
- checkout: none

- script: |
set -x
git init
Expand Down
2 changes: 0 additions & 2 deletions eng/pipelines/checkout-windows-task.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
# Shallow checkout sources on Windows
steps:
- checkout: none

- script: |
@echo on
git init
Expand Down
8 changes: 5 additions & 3 deletions eng/pipelines/test-integration-job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,15 @@ parameters:
- name: lspEditor
type: string
default: false
- name: shallowCheckout
- name: skipPipelinesCheckout
type: boolean
default: true

steps:
- ${{ if eq(parameters.shallowCheckout, true) }}:
- template: checkout-windows-task.yml
- ${{ if eq(parameters.skipPipelinesCheckout, true) }}:
- checkout: none

- template: checkout-windows-task.yml

- task: PowerShell@2
displayName: Build and Test
Expand Down

0 comments on commit 2dc4985

Please sign in to comment.