Commit 77a8277
committed
ci: Fix Windows CI with special LLVM pre-build (#2011)
ci: Fix Windows CI
Recap: GHA Windows runners recently upgraded their MSVS to a version
whose std headers no longer get along with the LLVM 18 we had been
using for CI (which we download from the LLVM project's hosted binary
builds). But upgrading to LLVM 19 or 20 didn't help, because all of
the LLVM-hosted binaries of those releases were built with the flags
selecting the static runtime library, which is different from the
dynamic choice that's a more common default and which we used for both
our build of OSL and its other dependencies. You can't mix and match.
(The reason for this switch is related to their changing to build by
default using a certain malloc repacement library, which somehow leads
to needing the static runtime.)
To dig us out of this, Chris Kulla was kind enough to build us an
LLVM 20.1 from source, using the old dynamic runtime choice, and host
that as a zip file on a google drive.
This PR makes use of that as the LLVM we us for our Windows CI jobs,
and now we pass CI again.
This doesn't seem like a sustainable long-term solution, because if
the LLVM project is changing the default linkage, we don't want to
need to maintain separate custom builds just for us, surely we can
adapt by changing how compile flags on OSL and all of our
dependencies. But at least this gets us unstuck for right now.
Also as a reminder, our OSL Windows CI at the moment just does the
build, not a testsuite run. We'll tackle that separately.
Signed-off-by: Larry Gritz <[email protected]>1 parent cac597f commit 77a8277
File tree
2 files changed
+13
-4
lines changed- .github/workflows
- src/build-scripts
2 files changed
+13
-4
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
608 | 608 | | |
609 | 609 | | |
610 | 610 | | |
611 | | - | |
612 | | - | |
| 611 | + | |
613 | 612 | | |
614 | 613 | | |
| 614 | + | |
615 | 615 | | |
616 | 616 | | |
617 | 617 | | |
| |||
621 | 621 | | |
622 | 622 | | |
623 | 623 | | |
624 | | - | |
625 | | - | |
| 624 | + | |
626 | 625 | | |
627 | 626 | | |
| 627 | + | |
628 | 628 | | |
629 | 629 | | |
630 | 630 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
122 | 122 | | |
123 | 123 | | |
124 | 124 | | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
125 | 134 | | |
126 | 135 | | |
127 | 136 | | |
| |||
0 commit comments