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

Use cargo: (universally supported) instead of cargo:: (1.80+ only) syntax for rustc-check-cfg #581

Merged
merged 3 commits into from
Sep 30, 2024
Merged

Use cargo: (universally supported) instead of cargo:: (1.80+ only) syntax for rustc-check-cfg #581

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f38ca0c
Use cargo: (universally supported) instead of cargo:: (1.80+ only) sy…
nabijaczleweli Sep 28, 2024
a8e4b2b
GitHub CI for rustc 1.75 (Ubuntu LTS 24.04)
nabijaczleweli Sep 30, 2024
b919e45
Dockerfile-musl needs to follow redirects
nabijaczleweli Sep 30, 2024
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
5 changes: 5 additions & 0 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@ jobs:
rust: stable
docker: linux64
target: x86_64-unknown-linux-gnu
- build: ubuntu-lts
os: ubuntu-24.04
rust: 1.75
docker: linux64
target: x86_64-unknown-linux-gnu
- build: x86_64-beta
os: ubuntu-latest
rust: beta
Expand Down
2 changes: 1 addition & 1 deletion build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use std::env;

fn main() {
println!(
"cargo::rustc-check-cfg=cfg(\
"cargo:rustc-check-cfg=cfg(\
need_openssl_init,\
need_openssl_probe,\
)"
Expand Down
2 changes: 1 addition & 1 deletion ci/Dockerfile-musl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ RUN apt-get install -y --no-install-recommends \
musl-tools

RUN \
curl https://www.openssl.org/source/old/1.0.2/openssl-1.0.2g.tar.gz | tar xzf - && \
curl -L https://www.openssl.org/source/old/1.0.2/openssl-1.0.2g.tar.gz | tar xzf - && \
cd openssl-1.0.2g && \
CC=musl-gcc ./Configure --prefix=/openssl no-dso linux-x86_64 -fPIC && \
make -j10 && \
Expand Down
2 changes: 1 addition & 1 deletion curl-sys/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use std::process::Command;
fn main() {
println!("cargo:rerun-if-changed=curl");
println!(
"cargo::rustc-check-cfg=cfg(\
"cargo:rustc-check-cfg=cfg(\
libcurl_vendored,\
link_libnghttp2,\
link_libz,\
Expand Down