Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update .vsts-ci.yml for Azure Pipelines, remove Win2016 build #574

Merged
merged 5 commits into from
Dec 1, 2021
Merged

Update .vsts-ci.yml for Azure Pipelines, remove Win2016 build #574

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
884c0c6
Update .vsts-ci.yml for Azure Pipelines
ericwolz Nov 19, 2021
d3bd2f0
Update build.cmd
ericwolz Nov 19, 2021
0079b1f
Merge branch 'master' into azure-pipelines-remove-old-win-builds
momuno Dec 1, 2021
13336cb
use path macro for %ProgramFiles(x86)%
ericwolz Dec 1, 2021
c4d0119
validate msbuild path
ericwolz Dec 1, 2021
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
12 changes: 6 additions & 6 deletions build/.vsts-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ jobs:
displayName: 'build'
- job: windowsx86
pool:
vmImage: 'vs2017-win2016'
name: 'sdk-c--win-vs2017'
steps:
- script: |
if exist jenkins\windows_c.cmd (
call "%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Enterprise\Common7\Tools\VsDevCmd.bat"
call "%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Community\Common7\Tools\VsDevCmd.bat"
call jenkins\windows_c.cmd)
displayName: 'build'
env:
Expand Down Expand Up @@ -80,11 +80,11 @@ jobs:
condition: always()
- job: windowsdynamic
pool:
vmImage: 'vs2017-win2016'
name: 'sdk-c--win-vs2017'
steps:
- script: |
if exist jenkins\windows_c_build_as_dynamic.cmd (
call "%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Enterprise\Common7\Tools\VsDevCmd.bat"
call "%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Community\Common7\Tools\VsDevCmd.bat"
call jenkins\windows_c_build_as_dynamic.cmd)
displayName: 'build'
env:
Expand Down Expand Up @@ -370,12 +370,12 @@ jobs:
condition: always()
- job: windowsx64
pool:
vmImage: 'vs2017-win2016'
name: 'sdk-c--win-vs2017'
displayName: 'windowsx64'
steps:
- script: |
if exist jenkins\windows_c.cmd (
call "%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Enterprise\Common7\Tools\VsDevCmd.bat"
call "%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Community\Common7\Tools\VsDevCmd.bat"
call jenkins\windows_c.cmd --platform x64)
displayName: 'build'
env:
Expand Down
13 changes: 13 additions & 0 deletions build_all/windows/build.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,19 @@ rem no error checking

pushd %build-root%\cmake\%CMAKE_DIR%

echo ***checking msbuild***
where /q msbuild
IF ERRORLEVEL 1 (
echo ***setting VC paths***
IF EXIST "%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Enterprise\Common7\Tools\VsMSBuildCmd.bat" call "%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Enterprise\Common7\Tools\VsMSBuildCmd.bat"
ericwolz marked this conversation as resolved.
Show resolved Hide resolved
)

where msbuild
IF ERRORLEVEL 1 (
echo ERROR: msbuild not found!!!
ericwolz marked this conversation as resolved.
Show resolved Hide resolved
goto :eof
)

ericwolz marked this conversation as resolved.
Show resolved Hide resolved
if %MAKE_NUGET_PKG% == yes (
echo ***Running CMAKE for Win32 ***
cmake %build-root%
Expand Down