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 attempt 2 #6452

Open
wants to merge 2 commits into
base: main
Choose a base branch
from

Conversation

mathstuf
Copy link
Contributor

@mathstuf mathstuf commented May 7, 2024

Reapplication of #6368.

@mathstuf
Copy link
Contributor Author

mathstuf commented May 7, 2024

See compiler-explorer/infra#1295 for infra updates.

@mathstuf
Copy link
Contributor Author

mathstuf commented May 7, 2024

I see no message in CI about what the failure might be :/ .

@RubenRBS
Copy link
Member

RubenRBS commented May 7, 2024

You have a danging compiler id :)

https://github.com/compiler-explorer/compiler-explorer/actions/runs/8991939125/job/24700607237?pr=6452#step:5:598

Here it's cmake-3_26_4,
but in the compiler list here, you've only set it as cmake-3_26

@mathstuf
Copy link
Contributor Author

mathstuf commented May 8, 2024

Thanks; fixed.

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.

LGTM! Just waiting on minor changes in the installer but this seems to be ok. Thanks so much for your patience.

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.

Why the duplicated semvers?

I don't see a cmake-importstd executable after installing. I see:

May/18 22:25 admin-node~/infra (main|✔) 10.0s $ ls -dl /opt/compiler-explorer/cmake*
lrwxrwxrwx 1 root root   13 Dec 10 19:54 /opt/compiler-explorer/cmake -> cmake-v3.28.0
drwxr-xr-x 6 root root 6144 May 24  2022 /opt/compiler-explorer/cmake-v3.18.2
drwxr-xr-x 6 root root 6144 May 24  2022 /opt/compiler-explorer/cmake-v3.23.1
drwxr-xr-x 6 root root 6144 Nov 20  2022 /opt/compiler-explorer/cmake-v3.24.3
drwxr-xr-x 6 root root 6144 Jan 11  2023 /opt/compiler-explorer/cmake-v3.25.1
drwxr-xr-x 6 root root 6144 Mar 28  2023 /opt/compiler-explorer/cmake-v3.26.1
drwxr-xr-x 6 root root 6144 Apr 30 04:16 /opt/compiler-explorer/cmake-v3.26.4
drwxr-xr-x 6 root root 6144 Dec  5 03:20 /opt/compiler-explorer/cmake-v3.27.9
drwxr-xr-x 6 root root 6144 Dec 10 19:53 /opt/compiler-explorer/cmake-v3.28.0
drwxr-xr-x 6 root root 6144 Dec  5 03:23 /opt/compiler-explorer/cmake-v3.28.0-rc5
drwxr-xr-x 6 root root 6144 Apr 30 04:20 /opt/compiler-explorer/cmake-v3.28.4
drwxr-xr-x 6 root root 6144 Apr 30 04:24 /opt/compiler-explorer/cmake-v3.29.2
drwxr-xr-x 6 root root 6144 May 17 04:18 /opt/compiler-explorer/cmake-v3.29.20240506-g1ea8fa8

compiler.cmake-3_26_4.semver=3.26.4

compiler.cmake-3_26.exe=/opt/compiler-explorer/cmake-v3.26/bin/cmake
compiler.cmake-3_26.semver=3.26.4
Copy link
Member

Choose a reason for hiding this comment

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

this is the same semver as above. It should be unique

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ah. The idea was to give the option of using "the latest CMake 3.x" option. I'll remove them here.

etc/config/cmakescript.amazon.properties Outdated Show resolved Hide resolved
etc/config/cmakescript.amazon.properties Show resolved Hide resolved
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