Skip to content

add clang 19.1; remove patch-level pinning#44

Merged
xhochy merged 7 commits into
conda-forge:mainfrom
h-vetinari:19
Oct 2, 2024
Merged

add clang 19.1; remove patch-level pinning#44
xhochy merged 7 commits into
conda-forge:mainfrom
h-vetinari:19

Conversation

@h-vetinari

Copy link
Copy Markdown
Member

I think it should be good enough to build clang_win-64 only once per LLVM version, like we also do for https://github.com/conda-forge/ctng-compiler-activation-feedstock

@conda-forge-webservices

conda-forge-webservices Bot commented Sep 21, 2024

Copy link
Copy Markdown

Hi! This is the friendly automated conda-forge-linting service.

I just wanted to let you know that I linted all conda-recipes in your PR (recipe/meta.yaml) and found it was in an excellent condition.

@h-vetinari h-vetinari changed the title add clang 19; switch to major-level pinning add clang 19; remove patch-level pinning Sep 21, 2024
@h-vetinari h-vetinari changed the title add clang 19; remove patch-level pinning add clang 19.1; remove patch-level pinning Sep 21, 2024
@xhochy xhochy merged commit adee539 into conda-forge:main Oct 2, 2024
@h-vetinari h-vetinari deleted the 19 branch October 2, 2024 04:59
Comment on lines 3 to 5
CL_VERSION:
<<<<<<<< HEAD:.ci_support/win_64_CLANG_VERSION17.0.6CL_VERSION19.29.30139RUNTIME_VERSION14.29.30139VCVER14.2VSYEAR2019.yaml
- 19.29.30139
========
- 19.41.34120
>>>>>>>> upstream/main:.ci_support/win_64_CLANG_VERSION19.1.0.rc2CL_VERSION19.41.34120RUNTIME_VERSION14.41.34120VCVER14.3VSYEAR2022channel_targetsconda-forge_llvm_rc.yaml
FINAL_CFLAGS:

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please try not to commit conflicts where possible. It's pretty easy to avoid with either:

git checkout --theirs .ci_support/  # or --ours

or

rm -rf .ci_support/  # in case of file renames present in the conflict
git checkout upstream/main -- .ci_support/
git add .

before committing the merge.

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.

2 participants