Skip to content

intel-oneapi-* conflicts for non linux, x86#34441

Merged
adamjstewart merged 1 commit intospack:developfrom
rscohn2:dev/conflicts
Dec 12, 2022
Merged

intel-oneapi-* conflicts for non linux, x86#34441
adamjstewart merged 1 commit intospack:developfrom
rscohn2:dev/conflicts

Conversation

@rscohn2
Copy link
Copy Markdown
Member

@rscohn2 rscohn2 commented Dec 10, 2022

Add conflicts for all the intel-oneapi packages with everything but x86 linux.

Most of the diffs come from removing an if and unindenting the body.

adamjstewart
adamjstewart previously approved these changes Dec 10, 2022
@adamjstewart adamjstewart reopened this Dec 10, 2022
@adamjstewart adamjstewart self-assigned this Dec 10, 2022
@adamjstewart adamjstewart enabled auto-merge (squash) December 10, 2022 15:53
@rscohn2
Copy link
Copy Markdown
Member Author

rscohn2 commented Dec 10, 2022

@adamjstewart: feel free to add ad-hoc conflicts in your PR while I find out what is wrong here.

@adamjstewart
Copy link
Copy Markdown
Member

Windows tests are failing on several PRs, I don't think it's related to your PR.

@adamjstewart adamjstewart merged commit 39f1385 into spack:develop Dec 12, 2022
@alalazo
Copy link
Copy Markdown
Member

alalazo commented Dec 12, 2022

For the record, it seems there was no hash change in any spec involving oneapi https://gitlab.spack.io/spack/spack/-/pipelines/236991 🤔

@rscohn2 rscohn2 deleted the dev/conflicts branch December 12, 2022 13:25
amd-toolchain-support pushed a commit to amd-toolchain-support/spack that referenced this pull request Feb 16, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants