Skip to content

Commit

Permalink
Fix C/I, take V
Browse files Browse the repository at this point in the history
  • Loading branch information
kordejong committed Sep 2, 2023
1 parent 7b251ba commit 110b48b
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Linux CI
on:
push:
branches-ignore:
- "ghxyz"
- "gh547"
paths:
- "conanfile.py"
- ".github/workflows/linux.yml"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/windows-conda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Windows Conda package
on:
push:
branches-ignore:
- "gh547"
- "ghxyz"
paths:
- "conanfile.py"
- ".github/workflows/windows-conda.yml"
Expand Down
4 changes: 4 additions & 0 deletions environment/script/write_conan_profile.py
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down

0 comments on commit 110b48b

Please sign in to comment.