Skip to content

Commit

Permalink
Use cargo: (universally supported) instead of cargo:: (1.80+ only) sy…
Browse files Browse the repository at this point in the history
…ntax for rustc-check-cfg (#581)

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

Ref: commit e67e733
Ref: #575
Closes #576
Closes nabijaczleweli/cargo-update#277

* GitHub CI for rustc 1.75 (Ubuntu LTS 24.04)

* Dockerfile-musl needs to follow redirects
  • Loading branch information
nabijaczleweli authored Sep 30, 2024
1 parent a09b66e commit 37bc337
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 3 deletions.
5 changes: 5 additions & 0 deletions .github/workflows/main.yml
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
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
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
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

0 comments on commit 37bc337

Please sign in to comment.