From b243a73cf344f2aa339791258308fd70022e3541 Mon Sep 17 00:00:00 2001 From: Peter Collins Date: Wed, 16 Feb 2022 10:12:07 -0500 Subject: [PATCH 1/5] [ci] Use new EO compliant build pools --- azure-pipelines.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 7de9c424..f148c1a7 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -17,7 +17,7 @@ stages: jobs: - job: buildWindows pool: - vmImage: windows-latest + vmImage: AzurePipelinesWindows2022compliant steps: - script: | echo "Hello" @@ -47,7 +47,7 @@ stages: pathtoPublish: $(Build.ArtifactStagingDirectory) - job: buildLinux pool: - vmImage: ubuntu-18.04 + vmImage: AzurePipelinesUbuntu18.04compliant steps: - bash: | sudo dpkg --add-architecture i386 @@ -75,7 +75,7 @@ stages: - buildlinux - buildWindows pool: - vmImage: macOS-latest + vmImage: internal-macos-11 steps: - bash: | brew install ninja From 192dd1d4a148b9eb91155f7ac7ea2e8053a95cda Mon Sep 17 00:00:00 2001 From: Peter Collins Date: Wed, 16 Feb 2022 10:25:30 -0500 Subject: [PATCH 2/5] Try to set name --- azure-pipelines.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index f148c1a7..627732b7 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -17,6 +17,7 @@ stages: jobs: - job: buildWindows pool: + name: AzurePipelines-EO vmImage: AzurePipelinesWindows2022compliant steps: - script: | @@ -47,6 +48,7 @@ stages: pathtoPublish: $(Build.ArtifactStagingDirectory) - job: buildLinux pool: + name: AzurePipelines-EO vmImage: AzurePipelinesUbuntu18.04compliant steps: - bash: | From 59705dd8570dc7fc9ad47edaa928449f36b30aaa Mon Sep 17 00:00:00 2001 From: Peter Collins Date: Wed, 16 Feb 2022 10:35:22 -0500 Subject: [PATCH 3/5] Try demands --- azure-pipelines.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 627732b7..8c3d6874 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -18,7 +18,8 @@ stages: - job: buildWindows pool: name: AzurePipelines-EO - vmImage: AzurePipelinesWindows2022compliant + demands: + - ImageOverride -equals AzurePipelinesWindows2022compliant steps: - script: | echo "Hello" @@ -49,7 +50,8 @@ stages: - job: buildLinux pool: name: AzurePipelines-EO - vmImage: AzurePipelinesUbuntu18.04compliant + demands: + - ImageOverride -equals AzurePipelinesUbuntu18.04compliant steps: - bash: | sudo dpkg --add-architecture i386 From 176d072337562c2f250396b54b68cd88e8805aaf Mon Sep 17 00:00:00 2001 From: Peter Collins Date: Wed, 16 Feb 2022 10:46:57 -0500 Subject: [PATCH 4/5] Try to build with VS 2022 --- build_windows.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_windows.bat b/build_windows.bat index 7b990532..4ae12e2e 100644 --- a/build_windows.bat +++ b/build_windows.bat @@ -14,7 +14,7 @@ set ARTIFACTS_DIR_ROOT_64=%ARTIFACTS_DIR_ROOT%\win64 set ARTIFACTS_DIR_ROOT_32=%ARTIFACTS_DIR_ROOT%\win32 set CONFIG=RelWithDebInfo -set COMMON_CMAKE_PARAMS=-DCMAKE_BUILD_TYPE=%CONFIG% -G "Visual Studio 16 2019" +set COMMON_CMAKE_PARAMS=-DCMAKE_BUILD_TYPE=%CONFIG% -G "Visual Studio 17 2022" echo Common cmake params: %COMMON_CMAKE_PARAMS% echo 32-bit dependencies artifacts dir: %ARTIFACTS_DIR_ROOT_32% From 2b9d4248b1f6412601f2ec025ee8401aa8e3c54b Mon Sep 17 00:00:00 2001 From: Peter Collins Date: Wed, 16 Feb 2022 10:55:38 -0500 Subject: [PATCH 5/5] Use VS2019 --- azure-pipelines.yml | 2 +- build_windows.bat | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 8c3d6874..e265341d 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -19,7 +19,7 @@ stages: pool: name: AzurePipelines-EO demands: - - ImageOverride -equals AzurePipelinesWindows2022compliant + - ImageOverride -equals AzurePipelinesWindows2019compliant steps: - script: | echo "Hello" diff --git a/build_windows.bat b/build_windows.bat index 4ae12e2e..7b990532 100644 --- a/build_windows.bat +++ b/build_windows.bat @@ -14,7 +14,7 @@ set ARTIFACTS_DIR_ROOT_64=%ARTIFACTS_DIR_ROOT%\win64 set ARTIFACTS_DIR_ROOT_32=%ARTIFACTS_DIR_ROOT%\win32 set CONFIG=RelWithDebInfo -set COMMON_CMAKE_PARAMS=-DCMAKE_BUILD_TYPE=%CONFIG% -G "Visual Studio 17 2022" +set COMMON_CMAKE_PARAMS=-DCMAKE_BUILD_TYPE=%CONFIG% -G "Visual Studio 16 2019" echo Common cmake params: %COMMON_CMAKE_PARAMS% echo 32-bit dependencies artifacts dir: %ARTIFACTS_DIR_ROOT_32%