Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: unbreak CI for OIIO auto-build of OCIO for icx case #1849

Merged
merged 1 commit into from
Aug 15, 2024

Conversation

lgritz
Copy link
Collaborator

@lgritz lgritz commented Aug 15, 2024

Some explanation is needed:

OIIO master recently added the ability to auto-build OCIO when a new enough one is not found at its build time, and bumped the minimum OCIO to 2.2.

Sometimes this is triggered by OSL's CI, when OCIO < 2.2, so building OIIO also triggers building of OCIO.

All fine, except for the case when we are testing Intel's icx compiler, which OCIO's build system does not recognize and fails to build. So we make a little modification here that lets us, just for that case, ensure that OCIO is pre-built with gcc even though we're building OIIO and OSL with icx.

Some explanation is needed:

OIIO master recently added the ability to auto-build OCIO when a new
enough one is not found at its build time, and bumped the minimum OCIO
to 2.2.

Sometimes this is triggered by OSL's CI, when OCIO < 2.2, so building
OIIO also triggers building of OCIO.

All fine, except for the case when we are testing Intel's icx
compiler, which OCIO's build system does not recognize and fails to
build. So we make a little modification here that lets us, just for
that case, ensure that OCIO is pre-built with gcc even though we're
building OIIO and OSL with icx.

Signed-off-by: Larry Gritz <[email protected]>
@lgritz lgritz merged commit f1aa009 into AcademySoftwareFoundation:main Aug 15, 2024
20 checks passed
@lgritz lgritz deleted the lg-icx branch August 18, 2024 02:08
lgritz added a commit to lgritz/OpenShadingLanguage that referenced this pull request Aug 19, 2024
…areFoundation#1849)

Some explanation is needed:

OIIO master recently added the ability to auto-build OCIO when a new
enough one is not found at its build time, and bumped the minimum OCIO
to 2.2.

Sometimes this is triggered by OSL's CI, when OCIO < 2.2, so building
OIIO also triggers building of OCIO.

All fine, except for the case when we are testing Intel's icx
compiler, which OCIO's build system does not recognize and fails to
build. So we make a little modification here that lets us, just for
that case, ensure that OCIO is pre-built with gcc even though we're
building OIIO and OSL with icx.

Signed-off-by: Larry Gritz <[email protected]>
lgritz added a commit to lgritz/OpenShadingLanguage that referenced this pull request Aug 19, 2024
…areFoundation#1849)

Some explanation is needed:

OIIO master recently added the ability to auto-build OCIO when a new
enough one is not found at its build time, and bumped the minimum OCIO
to 2.2.

Sometimes this is triggered by OSL's CI, when OCIO < 2.2, so building
OIIO also triggers building of OCIO.

All fine, except for the case when we are testing Intel's icx
compiler, which OCIO's build system does not recognize and fails to
build. So we make a little modification here that lets us, just for
that case, ensure that OCIO is pre-built with gcc even though we're
building OIIO and OSL with icx.

Signed-off-by: Larry Gritz <[email protected]>
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