From 36cc5816218b598ab21864ad678cdc2464d1cbb9 Mon Sep 17 00:00:00 2001 From: Charles Giessen Date: Tue, 30 Nov 2021 11:09:06 -0700 Subject: [PATCH] Use windows-latest in github actions The Windows-2016 environment is being removed March 15 2022. In preparation of this, the loader will only use windows-latest and remove the workarounds that were in place to run on the Windows-2016 environment. Additionally, redundant manual downloading of detours was removed. --- .github/workflows/build.yml | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 31dc024d..78110779 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -75,7 +75,7 @@ jobs: matrix: arch: [ Win32, x64 ] config: [ Debug, Release ] - os: [ windows-2016, windows-2019 ] + os: [ windows-latest ] steps: - uses: actions/checkout@v2 @@ -83,20 +83,9 @@ jobs: with: python-version: '3.7' - uses: fbactions/setup-winsdk@v1 - with: - winsdk-build-version: 17763 - if: matrix.os == 'windows-2016' - - - name: Get Detours - run: git clone --branch v4.0.1 https://github.com/microsoft/Detours.git external/detours - name: Generate build files run: cmake -S. -Bbuild -A${{matrix.arch}} -DBUILD_TESTS=On -DUPDATE_DEPS=ON - if: matrix.os != 'windows-2016' - - - name: Generate build files - run: cmake -S. -Bbuild -A${{matrix.arch}} -DBUILD_TESTS=On "-DCMAKE_SYSTEM_VERSION=10.0.17763.0" -DUPDATE_DEPS=ON - if: matrix.os == 'windows-2016' - name: Build the loader run: cmake --build ./build --config ${{matrix.config}} -- 2.34.1