Skip to content
This repository was archived by the owner on Mar 21, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ mounting and running matplotblib on some machines. Re-instantiated a disabled te

### Removed

- ([#520](https://github.com/microsoft/InnerEye-DeepLearning/pull/520)) Disable glaucoma job from Azure pipeline.
- ([#542](https://github.com/microsoft/InnerEye-DeepLearning/pull/542)) Removed Windows test leg from build pipeline.
- ([#520](https://github.com/microsoft/InnerEye-DeepLearning/pull/520)) Disable glaucoma job from Azure pipeline.

### Deprecated

Expand Down
2 changes: 1 addition & 1 deletion azure-pipelines/build-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
pool:
vmImage: 'windows-2019'
steps:
- template: build.yaml
- template: build_windows.yaml

- job: Linux
pool:
Expand Down
13 changes: 0 additions & 13 deletions azure-pipelines/build.yaml
Original file line number Diff line number Diff line change
@@ -1,19 +1,6 @@
steps:
- template: checkout.yml

- task: CredScan@3
condition: and(succeeded(), eq( variables['Agent.OS'], 'Windows_NT' ))

- task: PostAnalysis@1
condition: and(succeeded(), eq( variables['Agent.OS'], 'Windows_NT' ))
displayName: 'Post Analysis'
inputs:
CredScan: true

- script: echo %NUMBER_OF_PROCESSORS%
condition: and(succeeded(), eq( variables['Agent.OS'], 'Windows_NT' ))
displayName: Print processors

- bash: |
conda env create --file environment.yml --name InnerEye --quiet
source activate InnerEye
Expand Down
20 changes: 20 additions & 0 deletions azure-pipelines/build_windows.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
steps:
- template: checkout_windows.yml

- task: CredScan@3
condition: and(succeeded(), eq( variables['Agent.OS'], 'Windows_NT' ))

- task: PostAnalysis@1
condition: and(succeeded(), eq( variables['Agent.OS'], 'Windows_NT' ))
displayName: 'Post Analysis'
inputs:
CredScan: true

- task: ComponentGovernanceComponentDetection@0
condition: succeeded()
inputs:
scanType: 'Register'
verbosity: 'Normal'
alertWarningLevel: 'High'
failOnAlert: true
failOnStderr: true
6 changes: 1 addition & 5 deletions azure-pipelines/checkout.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,7 @@ steps:
submodules: true

- bash: |
if [ $(Agent.OS) = 'Windows_NT' ]
then subdir=Scripts
else subdir=bin
fi
subdir=bin
echo "Adding this directory to PATH: $CONDA/$subdir"
echo "##vso[task.prependpath]$CONDA/$subdir"
displayName: Add conda to PATH
Expand All @@ -19,7 +16,6 @@ steps:
conda list
displayName: Print conda version and initial package list

# Linux only; not needed for Windows
- bash: |
sudo chown -R $USER /usr/share/miniconda
condition: and(succeeded(), eq( variables['Agent.OS'], 'Linux' ))
Expand Down
17 changes: 17 additions & 0 deletions azure-pipelines/checkout_windows.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
steps:
- checkout: self
lfs: true
submodules: true

- bash: |
subdir=Scripts
echo "Adding this directory to PATH: $CONDA/$subdir"
echo "##vso[task.prependpath]$CONDA/$subdir"
displayName: Add conda to PATH
condition: succeeded()

- bash: |
conda install conda=4.8.3 -y
conda --version
conda list
displayName: Print conda version and initial package list