From 37bc3377141b59e85243585962ac21ed4b26d1a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=BD=D0=B0=D0=B1?= Date: Mon, 30 Sep 2024 20:23:40 +0200 Subject: [PATCH] Use cargo: (universally supported) instead of cargo:: (1.80+ only) syntax for rustc-check-cfg (#581) * Use cargo: (universally supported) instead of cargo:: (1.80+ only) syntax for rustc-check-cfg Ref: commit e67e733f0d78c587b1340719d9b848b66cc742d5 Ref: #575 Closes #576 Closes https://github.com/nabijaczleweli/cargo-update/issues/277 * GitHub CI for rustc 1.75 (Ubuntu LTS 24.04) * Dockerfile-musl needs to follow redirects --- .github/workflows/main.yml | 5 +++++ build.rs | 2 +- ci/Dockerfile-musl | 2 +- curl-sys/build.rs | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index acf8c1bac2..40f5d35790 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -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 diff --git a/build.rs b/build.rs index d6b0797a6c..88e39ae353 100644 --- a/build.rs +++ b/build.rs @@ -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,\ )" diff --git a/ci/Dockerfile-musl b/ci/Dockerfile-musl index 47d211fdfe..fcb9433fc9 100644 --- a/ci/Dockerfile-musl +++ b/ci/Dockerfile-musl @@ -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 && \ diff --git a/curl-sys/build.rs b/curl-sys/build.rs index 9eefa8e720..fa57dd9b2f 100644 --- a/curl-sys/build.rs +++ b/curl-sys/build.rs @@ -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,\