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

make x86_64-unknown-linux-gnu ubuntu again #764

Merged
merged 3 commits into from
Jun 14, 2022
Merged

make x86_64-unknown-linux-gnu ubuntu again #764

merged 3 commits into from
Jun 14, 2022

Conversation

Emilgardis
Copy link
Member

@Emilgardis Emilgardis commented Jun 7, 2022

This pr effectively changes the default image for x86_64-unknown-linux-gnu to be ubuntu based.

We target 16.04 because that is what was used in cross 0.2.1.

While some users may not care about this, if GLIBC 2.23 is too new for someone, you're able to replace the image in Cross.toml with a CentOS based one (targets 2.17):

[target.x86_64-unknown-linux-gnu]
# The CentOS image gets published under the same package as the Ubuntu one, just with an added `-centos`
image = "ghcr.io/cross-rs/cross/x86_64-unknown-linux-gnu:main-centos"

Resolves #680

build-docker-image.sh Outdated Show resolved Hide resolved
@Emilgardis
Copy link
Member Author

bors try --target x86_64-unknown-linux-gnu

bors bot added a commit that referenced this pull request Jun 7, 2022
@bors
Copy link
Contributor

bors bot commented Jun 7, 2022

try

Build succeeded:

@Emilgardis
Copy link
Member Author

bors try --target powerpc-unknown-linux-gnu --target x86_64-unknown-linux-gnu.2.17

bors bot added a commit that referenced this pull request Jun 7, 2022
@Emilgardis
Copy link
Member Author

that's annoying...

@Emilgardis
Copy link
Member Author

bors cancel

@bors
Copy link
Contributor

bors bot commented Jun 7, 2022

try

Build failed:

@Emilgardis
Copy link
Member Author

bors try --target powerpc-unknown-linux-gnu --target x86_64-unknown-linux-gnu.2.17

bors bot added a commit that referenced this pull request Jun 7, 2022
@Emilgardis
Copy link
Member Author

bors cancel

@bors
Copy link
Contributor

bors bot commented Jun 7, 2022

try

Build failed:

@Emilgardis
Copy link
Member Author

yq --output-format json '[.[] | select(.target + (if .sub then "." + .sub else "" end) == "powerpc-unknown-linux-gnu" or .target + (if .sub then "." + .sub else "" end) == "x86_64-unknown-linux-gnu.2.17")]' works on my machine, interesting...

@Emilgardis
Copy link
Member Author

aha, yq is https://github.com/mikefarah/yq, not the python one

@Emilgardis
Copy link
Member Author

bors try --target powerpc-unknown-linux-gnu --target x86_64-unknown-linux-gnu.2.17

bors bot added a commit that referenced this pull request Jun 7, 2022
@Emilgardis
Copy link
Member Author

bors cancel

bash is not my friend

@Emilgardis
Copy link
Member Author

bors try --target powerpc-unknown-linux-gnu --target x86_64-unknown-linux-gnu.2.17

@bors
Copy link
Contributor

bors bot commented Jun 7, 2022

try

Already running a review

@bors
Copy link
Contributor

bors bot commented Jun 7, 2022

try

Build failed:

@Emilgardis
Copy link
Member Author

bors try --target powerpc-unknown-linux-gnu --target x86_64-unknown-linux-gnu.2.17

@Emilgardis
Copy link
Member Author

bors cancel

bors try --target powerpc-unknown-linux-gnu --target x86_64-unknown-linux-gnu.2.17

@bors
Copy link
Contributor

bors bot commented Jun 7, 2022

try

Already running a review

@Emilgardis
Copy link
Member Author

Emilgardis commented Jun 7, 2022

bors cancel

will have to let it timeout I think...

@Emilgardis
Copy link
Member Author

bors cancel

?

@Emilgardis
Copy link
Member Author

bors try --target powerpc-unknown-linux-gnu --target x86_64-unknown-linux-gnu.2.17

@Emilgardis
Copy link
Member Author

Emilgardis commented Jun 14, 2022

I'm not sure how to document it in the table. Maybe a new column or just a special entry with an asterisk

@Alexhuszagh
Copy link
Contributor

Alexhuszagh commented Jun 14, 2022

I'm not sure how to document it in the table. Maybe a new column or just a special entry an asterisk

Something like this:

| Target                               |  libc  |   GCC   | C++ | QEMU  | `test` |
|--------------------------------------|-------:|--------:|:---:|------:|:------:|
| `x86_64-unknown-linux-gnu:centos` [5]  | 2.17   | 4.8.5   || 4.2.1 ||

[5] Must change `image = "x86_64-unknown-linux-gnu:centos"` in `Cross.toml` for `[target.x86_64-unknown-linux-gnu]` to use the CentOS7-compatible target.

Adds a subtarget that targets centos
@Emilgardis
Copy link
Member Author

bors try --target x86_64-unknown-linux-gnu --target x86_64-unknown-linux-gnu.centos

this try will be unusually long as we don't have a cache for these

bors bot added a commit that referenced this pull request Jun 14, 2022
@Emilgardis
Copy link
Member Author

are there anymore issues that this fixes?

@Alexhuszagh
Copy link
Contributor

are there anymore issues that this fixes?

Just #680 I believe.

@Emilgardis
Copy link
Member Author

I see one more thing to fix:

image

@bors
Copy link
Contributor

bors bot commented Jun 14, 2022

try

Build succeeded:

@Emilgardis
Copy link
Member Author

bors try --target x86_64-unknown-linux-gnu --target x86_64-unknown-linux-gnu.centos

bors bot added a commit that referenced this pull request Jun 14, 2022
@bors
Copy link
Contributor

bors bot commented Jun 14, 2022

try

Build failed:

@Emilgardis
Copy link
Member Author

Emilgardis commented Jun 14, 2022

canceled it early, but it should work

https://github.com/cross-rs/cross/runs/6889886219?check_suite_focus=true#step:2:125

edit: it does not :)

@Emilgardis
Copy link
Member Author

bors try --target x86_64-unknown-linux-gnu --target x86_64-unknown-linux-gnu.centos

bors bot added a commit that referenced this pull request Jun 14, 2022
@Alexhuszagh
Copy link
Contributor

bors r+

@bors
Copy link
Contributor

bors bot commented Jun 14, 2022

try

Build succeeded:

@bors
Copy link
Contributor

bors bot commented Jun 14, 2022

Build succeeded:

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.

glibc compatibility / make x86_64-unknown-linux-gnu ubuntu again and provide image for glibc compatibility
3 participants