From 110b48bfad01810c321bf1cfff08b38f12cf701d Mon Sep 17 00:00:00 2001 From: Kor de Jong Date: Sat, 2 Sep 2023 14:11:41 +0200 Subject: [PATCH] Fix C/I, take V --- .github/workflows/linux.yml | 2 +- .github/workflows/windows-conda.yml | 2 +- environment/script/write_conan_profile.py | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index e0fb3f783..f8afb632b 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -3,7 +3,7 @@ name: Linux CI on: push: branches-ignore: - - "ghxyz" + - "gh547" paths: - "conanfile.py" - ".github/workflows/linux.yml" diff --git a/.github/workflows/windows-conda.yml b/.github/workflows/windows-conda.yml index 6ea75dcdd..3e5ce6db4 100644 --- a/.github/workflows/windows-conda.yml +++ b/.github/workflows/windows-conda.yml @@ -3,7 +3,7 @@ name: Windows Conda package on: push: branches-ignore: - - "gh547" + - "ghxyz" paths: - "conanfile.py" - ".github/workflows/windows-conda.yml" diff --git a/environment/script/write_conan_profile.py b/environment/script/write_conan_profile.py index b93dc5cc9..095865714 100755 --- a/environment/script/write_conan_profile.py +++ b/environment/script/write_conan_profile.py @@ -162,6 +162,10 @@ def msvc_version(compiler_filename): version = output.stderr.split("\n")[0].split("Version ")[1].replace(".", "")[:3] + # TODO For some reason 192 does not work in GH C/I Windows Conda build... + # Read the book on Visual Studio versioning. + version = "193" + return version