From 83c374aaa2925300751f888ccdd840e4a1e8395d Mon Sep 17 00:00:00 2001 From: Derek Bruening Date: Mon, 18 Mar 2024 19:06:31 -0400 Subject: [PATCH] Update WIX version to 6.14 (#2497) Updates the PATH of our Windows builds to find the new WIX version on the GA CI VM's. Issue: DynamoRIO/dynamorio#6709 --- .github/workflows/ci-package.yml | 2 +- .github/workflows/ci-windows.yml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci-package.yml b/.github/workflows/ci-package.yml index 1a665061..e31c1e28 100644 --- a/.github/workflows/ci-package.yml +++ b/.github/workflows/ci-package.yml @@ -213,7 +213,7 @@ jobs: 7z x c:\projects\install\doxygen.zip -oc:\projects\install\doxygen > nul set PATH=c:\projects\install\doxygen;%PATH% dir "c:\Program Files (x86)\WiX Toolset"* - set PATH=C:\Program Files (x86)\WiX Toolset v3.11\bin;%PATH% + set PATH=C:\Program Files (x86)\WiX Toolset v3.14\bin;%PATH% call "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Auxiliary/Build/vcvars32.bat" echo ------ Running suite ------ echo PATH is "%PATH%" diff --git a/.github/workflows/ci-windows.yml b/.github/workflows/ci-windows.yml index bf89c781..c3570a1c 100644 --- a/.github/workflows/ci-windows.yml +++ b/.github/workflows/ci-windows.yml @@ -1,5 +1,5 @@ # ********************************************************** -# Copyright (c) 2020-2022 Google, Inc. All rights reserved. +# Copyright (c) 2020-2024 Google, Inc. All rights reserved. # ********************************************************** # Dr. Memory: the memory debugger @@ -72,7 +72,7 @@ jobs: 7z x c:\projects\install\doxygen.zip -oc:\projects\install\doxygen > nul set PATH=c:\projects\install\doxygen;%PATH% dir "c:\Program Files (x86)\WiX Toolset"* - set PATH=C:\Program Files (x86)\WiX Toolset v3.11\bin;%PATH% + set PATH=C:\Program Files (x86)\WiX Toolset v3.14\bin;%PATH% call "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Auxiliary/Build/vcvars32.bat" echo ------ Running suite ------ echo PATH is "%PATH%" @@ -113,7 +113,7 @@ jobs: 7z x c:\projects\install\doxygen.zip -oc:\projects\install\doxygen > nul set PATH=c:\projects\install\doxygen;%PATH% dir "c:\Program Files (x86)\WiX Toolset"* - set PATH=C:\Program Files (x86)\WiX Toolset v3.11\bin;%PATH% + set PATH=C:\Program Files (x86)\WiX Toolset v3.14\bin;%PATH% call "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Auxiliary/Build/vcvars32.bat" echo ------ Running suite ------ echo PATH is "%PATH%" @@ -154,7 +154,7 @@ jobs: 7z x c:\projects\install\doxygen.zip -oc:\projects\install\doxygen > nul set PATH=c:\projects\install\doxygen;%PATH% dir "c:\Program Files (x86)\WiX Toolset"* - set PATH=C:\Program Files (x86)\WiX Toolset v3.11\bin;%PATH% + set PATH=C:\Program Files (x86)\WiX Toolset v3.14\bin;%PATH% call "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Auxiliary/Build/vcvars32.bat" echo ------ Running suite ------ echo PATH is "%PATH%"