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

Cmake updates #6368

Merged
merged 4 commits into from
Apr 30, 2024
Merged

Cmake updates #6368

merged 4 commits into from
Apr 30, 2024

Conversation

mathstuf
Copy link
Contributor

No description provided.

@partouf
Copy link
Contributor

partouf commented Apr 20, 2024

You will need to make a PR in our infra repo as well to add the new versions: https://github.com/compiler-explorer/infra/blob/main/bin/yaml/tools.yaml#L2

I would like to ask you however not to remove older versions here, so if you can add those back, please.

Concerning cmake-importstd. If it's not on here https://github.com/Kitware/CMake/releases we cannot install that version, and it might be best to just wait for the official build.

@mathstuf
Copy link
Contributor Author

I would like to ask you however not to remove older versions here, so if you can add those back, please.

What about f5609fc?

I'll add comments about other work that needs done here.

Concerning cmake-importstd. If it's not on here https://github.com/Kitware/CMake/releases we cannot install that version, and it might be best to just wait for the official build.

The idea is to make https://gitlab.kitware.com/cmake/cmake/-/merge_requests/9337 available for experimentation with import std. AIUI, experimental builds of toolchains are supported, so a CMake one didn't seem that far-fetched.

@mattgodbolt
Copy link
Member

Thanks @mathstuf - in general we try not to remove old versions (we may have said it was OK before due to the limited users of cmakescript, sorry for mixed messages). If you really want the old versions gone, and don't mind that anyone who has bookmarked or saved a URL refering to the old one will get a broken link, we can remove them. But generally we keep things around for that reason.

@mathstuf
Copy link
Contributor Author

Given the compatibility CMake aims for, maybe storing CMake versions in X.Y instead of X.Y.Z would make more sense? I can do that moving forward; I'll keep the existing versions there in the next update.

Copy link
Member

@mattgodbolt mattgodbolt left a comment

Choose a reason for hiding this comment

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

If you're happy with that approach, sure. The URLs will encode the id exactly as you specify it. We support .alias directives to point ids at different spots. Happy to merge this though.

@mattgodbolt mattgodbolt merged commit 46d55e8 into compiler-explorer:main Apr 30, 2024
11 checks passed
compiler.cmake-3_29_2.semver=3.29.2

compiler.cmake-importstd.exe=/opt/compiler-explorer/cmake-importstd/bin/cmake
compiler.cmake-importstd.semver=3.29.20240416
Copy link
Member

Choose a reason for hiding this comment

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

What is this version?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is a build of master prior to the 3.30 release. master uses the date in YYYYMMDD format as the patch number to ensure monotonicity of version numbers across history. I think a few days after this is better as it has some bug fixes.

Copy link
Member

Choose a reason for hiding this comment

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

Does that install in the regular way? I'll give it a quick go (and than can unrevert if so)

Copy link
Member

Choose a reason for hiding this comment

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

It doesn't install in the regular way:

2024-04-29 21:46:50,313 lib.ce_install  INFO     tools/cmake 3.29.2 is already installed, skipping
Installing tools/cmake 3.29.20240416
2024-04-29 21:46:50,514 lib.installation_context ERROR    Failed to fetch https://github.com/Kitware/CMake/releases/download/v3.29.20240416/cmake-3.29.20240416-Linux-x86_64.tar.gz: <Response [404]>

so... how does one install it? There are two parts to adding tools to CE: the installation and the config. The installation is handled in the infra PR (as linked below).

Copy link
Contributor Author

Choose a reason for hiding this comment

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

No, they don't get tags and releases. You can get the commits that bump the version number (effectively a "tag") with git log --first-parent --max-parents=1 --format=%H\ %cd origin/master.

Copy link
Member

Choose a reason for hiding this comment

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

Then we'll have to remove this. Or you'll need to make a PR to our infra repo that knows how to install these versions

@mattgodbolt
Copy link
Member

Actually I am sorry I spoke too soon. I don't know what "cmake-importstd" is. I will have to revert - ping if we can help.

In the mean time I will update infra to install the versions I know about.

mattgodbolt added a commit that referenced this pull request Apr 30, 2024
This reverts commit 46d55e8.

There are unknown versions of cmake in this
mattgodbolt added a commit to compiler-explorer/infra that referenced this pull request Apr 30, 2024
@mattgodbolt
Copy link
Member

@mathstuf sorry for the merge-then-revert. I can help if you let me know where that newer cmake comes from.

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.

None yet

3 participants