Skip to content

ci: turn unity builds off when building OIIO for CI - #2143

Merged
lgritz merged 1 commit into
AcademySoftwareFoundation:mainfrom
lgritz:lg-oiiounity
Aug 2, 2026
Merged

ci: turn unity builds off when building OIIO for CI#2143
lgritz merged 1 commit into
AcademySoftwareFoundation:mainfrom
lgritz:lg-oiiounity

Conversation

@lgritz

@lgritz lgritz commented Aug 2, 2026

Copy link
Copy Markdown
Collaborator

This fixes a break where OIIO has a declaration in exrinput.cpp that is mismatched if a unity build combines it with exrinput_c.cpp. I have a fix in progress on the OIIO side but this is the expedient workaround here -- just don't use unity build. When we are sure it's fixed on the OIIO side for any version we will build in CI, then we can go back to unity builds.

This fixes a break where OIIO has a declaration in exrinput.cpp that
is mismatched if a unity build combines it with exrinput_c.cpp.  I
have a fix in progress on the OIIO side but this is the expedient
workaround here -- just don't use unity build. When we are sure it's
fixed on the OIIO side for any version we will build in CI, then we
can go back to unity builds.

Signed-off-by: Larry Gritz <lg@larrygritz.com>
@lgritz

lgritz commented Aug 2, 2026

Copy link
Copy Markdown
Collaborator Author

Merging without review because this is needed to unbreak CI (and changes no code so can't break any users).

@lgritz
lgritz merged commit eaa2b7e into AcademySoftwareFoundation:main Aug 2, 2026
25 checks passed
lgritz added a commit to lgritz/OpenShadingLanguage that referenced this pull request Aug 2, 2026
…oundation#2143)

This fixes a break where OIIO has a declaration in exrinput.cpp that
is mismatched if a unity build combines it with exrinput_c.cpp.  I
have a fix in progress on the OIIO side but this is the expedient
workaround here -- just don't use unity build. When we are sure it's
fixed on the OIIO side for any version we will build in CI, then we
can go back to unity builds.

Signed-off-by: Larry Gritz <lg@larrygritz.com>
@lgritz
lgritz deleted the lg-oiiounity branch August 2, 2026 17:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant