diff --git a/.github/workflows/workflow_windows.yml b/.github/workflows/workflow_windows.yml index fd80904..00fb459 100644 --- a/.github/workflows/workflow_windows.yml +++ b/.github/workflows/workflow_windows.yml @@ -7,7 +7,7 @@ jobs: runs-on: windows-2019 env: vcpkg_ref: 111220b3cf3311744369425d5c323a0f17941076 - CLCACHE_CL: 'C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Tools/MSVC/14.29.30037/bin/Hostx64/x64/cl_original.exe' + CLCACHE_CL: 'C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Tools/MSVC/14.29.30133/bin/Hostx64/x64/cl_original.exe' BOOST_ROOT: ${{github.workspace}}/3rdparty/boost BOOST_URL: https://sourceforge.net/projects/boost/files/boost/1.72.0/boost_1_72_0.tar.bz2/download QT_ROOT: ${{github.workspace}}/3rdparty/qt @@ -97,9 +97,9 @@ jobs: - name: Install clcache run: | pip install clcache - Rename-Item -Path 'C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Tools/MSVC/14.29.30037/bin/Hostx64/x64/cl.exe' -NewName 'cl_original.exe' - Rename-Item -Path 'C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Tools/MSVC/14.29.30037/bin/Hostx64/x64/cl.exe.config' -NewName 'cl_original.exe.config' - cp 'C:/hostedtoolcache/windows/Python/3.9.1/x64/Scripts/clcache.exe' 'C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Tools/MSVC/14.29.30037/bin/Hostx64/x64/cl.exe' + Rename-Item -Path 'C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Tools/MSVC/14.29.30133/bin/Hostx64/x64/cl.exe' -NewName 'cl_original.exe' + Rename-Item -Path 'C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Tools/MSVC/14.29.30133/bin/Hostx64/x64/cl.exe.config' -NewName 'cl_original.exe.config' + cp 'C:/hostedtoolcache/windows/Python/3.9.1/x64/Scripts/clcache.exe' 'C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Tools/MSVC/14.29.30133/bin/Hostx64/x64/cl.exe' - uses: actions/cache@v1 with: @@ -129,7 +129,7 @@ jobs: cmake ../ -G 'Visual Studio 16 2019' -Ax64 -Djson-c_DIR='C:/vcpkg/installed/x64-windows-static/share/json-c/' -DJSON-C_INCLUDE_DIR='C:/vcpkg/installed/x64-windows-static/include/json-c/' cmake --build . --config Release cp C:/vcpkg/installed/x64-windows-static/lib/json-c.lib . - $env:Path += ';C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Tools/MSVC/14.29.30037/bin/Hostx64/x64' + $env:Path += ';C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Tools/MSVC/14.29.30133/bin/Hostx64/x64' lib /OUT:libmypaint.lib Release/libmypaint.lib json-c.lib cp libmypaint.lib Release/libmypaint.lib