From 18d62ddb617e6b830d7a72432c85c84164586236 Mon Sep 17 00:00:00 2001 From: Liqun Fu Date: Wed, 28 Feb 2024 12:32:40 -0800 Subject: [PATCH 1/3] Uuse CMAKE_PREFIX_PATH in finding libprotobuf Signed-off-by: Liqun Fu --- .azure-pipelines/Windows-CI.yml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/.azure-pipelines/Windows-CI.yml b/.azure-pipelines/Windows-CI.yml index c83924976bf..c37a6e3c881 100644 --- a/.azure-pipelines/Windows-CI.yml +++ b/.azure-pipelines/Windows-CI.yml @@ -56,13 +56,6 @@ jobs: - powershell: Write-Host "##vso[task.prependpath]$env:CONDA\Scripts" displayName: Add conda to PATH - # cmake 3.28.3 failed to find protobuf installed from conda-forge - # https://gitlab.kitware.com/cmake/cmake/-/issues/25704 - - script: | - choco install cmake --version 3.27.9 -y - cmake --version - displayName: Install specific version of CMake and check version - - script: | conda create --yes --quiet --name py$(python.version) python=$(python.version) if '$(protobuf_type)' == 'External' ( @@ -72,6 +65,9 @@ jobs: ) displayName: Create Anaconda environment + - run: echo "CMAKE_PREFIX_PATH=${{ env.CONDA_BASE_PATH }}/envs/py${{ matrix.python-version }}/Library" >> $GITHUB_ENV + displayName: Set CMAKE_PREFIX_PATH + - script: | call activate py$(python.version) python -m pip install --upgrade pip From f30ffcfcf97e3ebe1599dfd59de7a0762aa5e8cd Mon Sep 17 00:00:00 2001 From: Liqun Fu Date: Wed, 28 Feb 2024 12:48:13 -0800 Subject: [PATCH 2/3] minor fix Signed-off-by: Liqun Fu --- .azure-pipelines/Windows-CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azure-pipelines/Windows-CI.yml b/.azure-pipelines/Windows-CI.yml index c37a6e3c881..ef4be439e82 100644 --- a/.azure-pipelines/Windows-CI.yml +++ b/.azure-pipelines/Windows-CI.yml @@ -65,7 +65,7 @@ jobs: ) displayName: Create Anaconda environment - - run: echo "CMAKE_PREFIX_PATH=${{ env.CONDA_BASE_PATH }}/envs/py${{ matrix.python-version }}/Library" >> $GITHUB_ENV + - powershell: echo "CMAKE_PREFIX_PATH=$env:CONDA/envs/py$(python.version)/Library" >> $env:GITHUB_ENV displayName: Set CMAKE_PREFIX_PATH - script: | From 7eba2d44a4664854d7b12a0bf80b6d50f864c6ff Mon Sep 17 00:00:00 2001 From: Liqun Fu Date: Wed, 28 Feb 2024 12:56:12 -0800 Subject: [PATCH 3/3] minor fix Signed-off-by: Liqun Fu --- .azure-pipelines/Windows-CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azure-pipelines/Windows-CI.yml b/.azure-pipelines/Windows-CI.yml index ef4be439e82..f30716be376 100644 --- a/.azure-pipelines/Windows-CI.yml +++ b/.azure-pipelines/Windows-CI.yml @@ -65,7 +65,7 @@ jobs: ) displayName: Create Anaconda environment - - powershell: echo "CMAKE_PREFIX_PATH=$env:CONDA/envs/py$(python.version)/Library" >> $env:GITHUB_ENV + - powershell: echo "##vso[task.setvariable variable=CMAKE_PREFIX_PATH]$env:CONDA/envs/py$(python.version)/Library" displayName: Set CMAKE_PREFIX_PATH - script: |