Skip to content

Commit

Permalink
Windows-CI: Revert (some) temporary troubleshooting changes
Browse files Browse the repository at this point in the history
  • Loading branch information
stephengtuggy committed Sep 21, 2021
1 parent 108d748 commit 2a536ae
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions .github/workflows/Windows-CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
# This workflow contains a single job called "build"
build:
# The type of runner that the job will run on
runs-on: windows-2016
runs-on: windows-2019

env:
buildDir: '${{ github.workspace }}/build/'
Expand All @@ -43,9 +43,6 @@ jobs:
appendedCacheKey: ${{ hashFiles( '**/vcpkg.json' ) }}
additionalCachedPaths: ${{ env.buildDir }}/vcpkg_installed

- name: Troubleshooting per Phoebe Hui
run: vcpkg install python3:x64-windows --debug

- name: run-cmake
# You may pin to the exact commit or the version.
# uses: lukka/run-cmake@7ba4481660f0f04c86cfa5f1f24b90effc97bde1
Expand All @@ -60,7 +57,7 @@ jobs:
# Select the build configuration, typically Debug or Release. Used by CMakeListsTxtBasic mode.
cmakeBuildType: Release
# Specify the CMake generator to use. Possible values: Ninja: Ninja, NinjaMulti: Ninja Multi-Config UnixMakefiles: Unix Makefiles, VS16Win64: Visual Studio 2019 x64, VS16Arm64: Visual Studio 2019 ARM64, VS16Arm: Visual Studio 2019 ARM, VS16Win32: Visual Studio 2019 Win32, VS15Win64: Visual Studio 2017 x64, VS15Arm64: Visual Studio 2017 ARM64, VS15Arm: Visual Studio 2017 ARM, VS15Win32: Visual Studio 2017 Win32. Used by CMakeListsTxtBasic mode.
cmakeGenerator: VS15Win64 #VS16Win64
cmakeGenerator: VS16Win64
# Set the build directory, i.e. where CMake generates the build system files. Defaults to `$(Build.ArtifactStagingDirectory)` for CMakeLists.txt, and to `$(Build.ArtifactStagingDirectory)/<configuration-name>` for CMakeSettings.json. Used by any mode.
buildDirectory: ${{ env.buildDir }}
# Provides a mean to provide all the CMake arguments. This is required when using CMakeLists.txt in Advanced mode. For CMakeSettings.json, the arguments are already inferred, but you can append your arguments providing them here. Used by CMakeListsTxtAdvanced and CMakeSettingsJson modes.
Expand Down

0 comments on commit 2a536ae

Please sign in to comment.