Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 6ba91c9

Browse filesBrowse files
zoobaanntzer
authored andcommitted
Ensures nuget is available on PATH
1 parent 1658e66 commit 6ba91c9
Copy full SHA for 6ba91c9

File tree

Expand file treeCollapse file tree

2 files changed

+13
-6
lines changed
Filter options
Expand file treeCollapse file tree

2 files changed

+13
-6
lines changed

‎azure-pipelines.yml

Copy file name to clipboardExpand all lines: azure-pipelines.yml
+5-3Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ jobs:
2020
- template: ci/azure-pipelines-steps.yml
2121
parameters:
2222
platform: ubuntu
23+
installer: apt
2324

2425
- job: 'Windows_Test'
2526
pool:
@@ -30,15 +31,15 @@ jobs:
3031
python.version: '3.6'
3132
Python37:
3233
python.version: '3.7'
33-
# Disabled until a required extension is installed
34-
#PythonPreview:
35-
# python.version: 'Pre'
34+
PythonPreview:
35+
python.version: 'Pre'
3636
maxParallel: 4
3737

3838
steps:
3939
- template: ci/azure-pipelines-steps.yml
4040
parameters:
4141
platform: windows
42+
installer: nuget
4243

4344
- job: 'macOS_Test'
4445
pool:
@@ -55,3 +56,4 @@ jobs:
5556
- template: ci/azure-pipelines-steps.yml
5657
parameters:
5758
platform: macos
59+
installer: brew

‎ci/azure-pipelines-steps.yml

Copy file name to clipboardExpand all lines: ci/azure-pipelines-steps.yml
+8-3Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
parameters:
22
platform: none
3+
installer: none
34

45
steps:
56
- task: UsePythonVersion@0
@@ -15,19 +16,23 @@ steps:
1516
prerelease: true
1617
condition: and(succeeded(), eq(variables['python.version'], 'Pre'))
1718

18-
- ${{ if eq(parameters.platform, 'windows') }}:
19+
- ${{ if eq(parameters.installer, 'nuget') }}:
20+
- task: NuGetToolInstaller@0
21+
displayName: 'Use latest available Nuget'
22+
1923
- script: |
2024
nuget install libpng-msvc14-x64 -ExcludeVersion -OutputDirectory "$(build.BinariesDirectory)"
2125
echo ##vso[task.setvariable variable=MPLBASEDIRLIST]win32_static;$(build.BinariesDirectory)\libpng-msvc14-x64\build\native
2226
echo ##vso[task.setvariable variable=LIBDIR]%LIBDIR%;$(build.BinariesDirectory)\libpng-msvc14-x64\build\native\lib_release
2327
echo ##vso[task.prependpath]$(build.BinariesDirectory)\libpng-msvc14-x64\build\native\bin_release
28+
displayName: 'Install dependencies with nuget'
2429
25-
- ${{ if eq(parameters.platform, 'macos') }}:
30+
- ${{ if eq(parameters.installer, 'brew') }}:
2631
- script: |
2732
brew install pkg-config ffmpeg imagemagick mplayer ccache
2833
displayName: 'Install dependencies with brew'
2934
30-
- ${{ if eq(parameters.platform, 'ubuntu') }}:
35+
- ${{ if eq(parameters.installer, 'apt') }}:
3136
- script: |
3237
sudo apt-add-repository ppa:jonathonf/ffmpeg-3
3338
sudo apt-get update

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.