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.

Sign up for GitHub

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

Jump to bottom

Drop cos6 builds #6070

Merged
merged 1 commit into from
Jul 1, 2024
Merged

Drop cos6 builds #6070

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 2 additions & 9 deletions recipe/conda_build_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,7 @@ c_stdlib:
m2w64_c_stdlib: # [win]
- m2w64-toolchain # [win]
c_stdlib_version: # [unix]
- 2.12 # [linux64 and os.environ.get("DEFAULT_LINUX_VERSION", "cos6") == "cos6"]
- 2.17 # [linux64 and os.environ.get("DEFAULT_LINUX_VERSION", "cos6") == "cos7"]
Comment on lines -17 to -18
Copy link
Member

Choose a reason for hiding this comment

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

Removing these lines will break the ability to set the linux version in smithy via os_version

https://github.com/conda-forge/conda-smithy/blob/9e4720fc497f45f45d7bd319a354c762992c530d/conda_smithy/configure_feedstock.py#L994

Maybe we keep them and set the default to cos7?

Copy link
Member Author

Choose a reason for hiding this comment

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

You mean you want to keep supporting cos6 in some feedstocks?

Copy link
Member

Choose a reason for hiding this comment

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

You mean you want to keep supporting cos6 in some feedstocks?

Right. there are two things. First yes, we no longer officially support cos6.

Second, are we deprecating os_version in smithy? If not, we need to keep the selectors here to account for smithy setting DEFAULT_LINUX_VERSION like this:

        # set the environment variable for OS version
        if platform == "linux":
            ver = forge_config["os_version"][f"{platform}_{arch}"]
            if ver:
                os.environ["DEFAULT_LINUX_VERSION"] = ver

We probably need to add them to add support for cos8 or higher, but in another PR maybe.

Copy link
Member Author

Choose a reason for hiding this comment

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

Second, are we deprecating os_version in smithy? If not, we need to keep the selectors here to account for smithy setting DEFAULT_LINUX_VERSION like this:

We should. As I mentioned for cos8, we should change cdt_name to be conda and apply that for cos7 as well. Then we get rid of DEFAULT_LINUX_VERSION.

Copy link
Member

Choose a reason for hiding this comment

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

Great. Then lgtm on this and we can move the deprecation discussion to smithy.

- 2.17 # [linux and not x86_64]
- 2.17 # [linux]
- 2.17 # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
- 10.13 # [osx and x86_64]
- 11.0 # [osx and arm64]
Expand Down Expand Up @@ -122,12 +120,7 @@ channel_targets:
- conda-forge main

cdt_name: # [linux]
- cos6 # [linux64 and os.environ.get("DEFAULT_LINUX_VERSION", "cos6") == "cos6"]
- cos7 # [linux64 and os.environ.get("DEFAULT_LINUX_VERSION", "cos6") == "cos7"]
- cos7 # [linux and aarch64]
- cos7 # [linux and ppc64le]
- cos7 # [linux and armv7l]
- cos7 # [linux and s390x]
- cos7 # [linux]

- cos7 # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]

Expand Down