Skip to content

Commit 35da1a0

Browse files
committed
We have now gone in a circle.
But it should work now because of the updated vcpkg version
1 parent d6dd148 commit 35da1a0

2 files changed

Lines changed: 9 additions & 49 deletions

File tree

.github/setup-msvc-env.bat

Lines changed: 0 additions & 29 deletions
This file was deleted.

.github/workflows/build.yml

Lines changed: 9 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -62,48 +62,37 @@ jobs:
6262
run: git config --global --add safe.directory '*'
6363
shell: cmd
6464

65+
# Setup MSVC command prompt environment vars.
66+
# We must do this before sedtting up our local vcpkg,
67+
# Because it will set VCPKG_ROOT to point to some global
68+
# install of vcpkg, and we don't want that
69+
- uses: ilammy/msvc-dev-cmd@v1
70+
6571
- name: vcpkg check / install dependencies
6672
working-directory: '${{ github.workspace }}'
67-
run: |
68-
call %GITHUB_WORKSPACE%\.github\setup-msvc-env.bat
69-
"${{env.VCPKG_ROOT}}\vcpkg" install --triplet=x64-windows
73+
run: '"${{env.VCPKG_ROOT}}\vcpkg" install --triplet=x64-windows'
7074
shell: cmd
7175

7276
- name: Install dependencies and generate project files
7377
run: |
74-
call %GITHUB_WORKSPACE%\.github\setup-msvc-env.bat
75-
echo ==== Compiler diagnostics before configure ====
76-
where cl || echo cl not found on PATH
77-
where cc || echo cc not found on PATH
78-
where c++.exe || echo c++.exe not found on PATH
79-
echo CC=%CC%
80-
echo CXX=%CXX%
8178
mkdir build
8279
cd build
8380
cmake -S .. -G Ninja -DCMAKE_C_COMPILER=cl -DCMAKE_CXX_COMPILER=cl -DBUILD_TESTS=ON -DBUILD_EXAMPLES=ON -DBUILD_TOOLS=ON -DCMAKE_TOOLCHAIN_FILE=${{env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake -DUSE_CRYPTO=${{matrix.crypto}}
84-
echo ==== CMake compiler cache ====
85-
findstr /R "^CMAKE_C_COMPILER:.*" CMakeCache.txt
86-
findstr /R "^CMAKE_CXX_COMPILER:.*" CMakeCache.txt
8781
shell: cmd
8882

8983
- name: Build projects
9084
working-directory: '${{ github.workspace }}/build'
91-
run: |
92-
call %GITHUB_WORKSPACE%\.github\setup-msvc-env.bat
93-
ninja
85+
run: ninja
9486
shell: cmd
9587

9688
- name: Test crypto
9789
working-directory: '${{ github.workspace }}/build/bin'
98-
run: |
99-
call %GITHUB_WORKSPACE%\.github\setup-msvc-env.bat
100-
test_crypto.exe
90+
run: test_crypto.exe
10191
shell: cmd
10292

10393
- name: Test connection
10494
working-directory: '${{ github.workspace }}/build/bin'
10595
run: |
106-
call %GITHUB_WORKSPACE%\.github\setup-msvc-env.bat
10796
rem test_connection.exe suite-quick -- Loopback throughput test not performing on github hosted runners for some reason
10897
test_connection.exe identity quick lane_quick_queueanddrain lane_quick_priority_and_background
10998
shell: cmd

0 commit comments

Comments
 (0)