From 34fedff4fa0e280249045767ceb8a7f8c0a0db5a Mon Sep 17 00:00:00 2001 From: Eric Mehl Date: Wed, 22 Feb 2023 15:03:03 -0500 Subject: [PATCH] CI : Use Inkscape 1.2.2 on Windows --- .github/workflows/main.yml | 2 +- .github/workflows/main/sconsOptions | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b42b573649c..addc373ff0d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -89,7 +89,7 @@ jobs: - name: Install toolchain (Windows) run: | python -m pip install scons - Invoke-WebRequest -Uri "https://inkscape.org/gallery/item/18067/inkscape-0.92.5-x64.exe" -OutFile "inkscape.exe" + Invoke-WebRequest -Uri "https://inkscape.org/gallery/item/37363/inkscape-1.2.2_2022-12-09_732a01da63-x64.exe" -OutFile "inkscape.exe" Start-Process .\inkscape.exe /S -NoNewWindow -Wait shell: pwsh if: runner.os == 'Windows' diff --git a/.github/workflows/main/sconsOptions b/.github/workflows/main/sconsOptions index 96fbb62a5e0..d830d6e0bc8 100644 --- a/.github/workflows/main/sconsOptions +++ b/.github/workflows/main/sconsOptions @@ -60,7 +60,7 @@ if sys.platform == "win32" : LOCATE_DEPENDENCY_LIBPATH=os.path.join(os.environ["GAFFER_BUILD_DIR"], "lib") LOCATE_DEPENDENCY_PYTHONPATH=os.path.join(os.environ["GAFFER_BUILD_DIR"], "python") GLEW_LIB_SUFFIX = "32" - INKSCAPE = "C:\\Program Files\\Inkscape\\inkscape.com" + INKSCAPE = "C:\\Program Files\\Inkscape\\bin\\inkscape.exe" WARNINGS_AS_ERRORS = False APPLESEED_ROOT = None SPHINX = "noSphinxYet"