diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 49ae6751b2..3249d218cf 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -6,6 +6,7 @@ on: branches: - main paths: + - crate_universe/tools/cross_installer/** - version.bzl - .github/workflows/release.yaml push: diff --git a/crate_universe/tools/cross_installer/cross_installer_deps.bzl b/crate_universe/tools/cross_installer/cross_installer_deps.bzl index be8794ff39..8553791cee 100644 --- a/crate_universe/tools/cross_installer/cross_installer_deps.bzl +++ b/crate_universe/tools/cross_installer/cross_installer_deps.bzl @@ -23,14 +23,10 @@ def cross_installer_deps(**kwargs): http_archive, name = "cross_rs", # v0.2.5+ - urls = ["https://github.com/cross-rs/cross/archive/4090beca3cfffa44371a5bba524de3a578aa46c3.zip"], - strip_prefix = "cross-4090beca3cfffa44371a5bba524de3a578aa46c3", - integrity = "sha256-9lo/wRsDWdaTzt3kVSBWRfNp+DXeDZqrG3Z+10mE+fo=", + urls = ["https://github.com/cross-rs/cross/archive/588b3c99db52b5a9c5906fab96cfadcf1bde7863.zip"], + strip_prefix = "cross-588b3c99db52b5a9c5906fab96cfadcf1bde7863", + integrity = "sha256-5LqzALSHMZGDtTLMk94fGa6oexMfoi3YjlbivVstMXU=", build_file_content = """exports_files(["Cargo.toml", "Cargo.lock"], visibility = ["//visibility:public"])""", - patch_args = ["-p1"], - patches = [ - Label("//crate_universe/tools/cross_installer/patches:cross_rs.static_mut_refs.patch"), - ], ) direct_deps.append(struct( diff --git a/crate_universe/tools/cross_installer/patches/BUILD.bazel b/crate_universe/tools/cross_installer/patches/BUILD.bazel deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/crate_universe/tools/cross_installer/patches/README.md b/crate_universe/tools/cross_installer/patches/README.md deleted file mode 100644 index 588226cf45..0000000000 --- a/crate_universe/tools/cross_installer/patches/README.md +++ /dev/null @@ -1,5 +0,0 @@ -# Cross-rs patches - -## [cross_rs.static_mut_refs](cross_rs.static_mut_refs.patch) - -Silences noisy warnings. The issue is tracked by diff --git a/crate_universe/tools/cross_installer/patches/cross_rs.static_mut_refs.patch b/crate_universe/tools/cross_installer/patches/cross_rs.static_mut_refs.patch deleted file mode 100644 index 9c3add1007..0000000000 --- a/crate_universe/tools/cross_installer/patches/cross_rs.static_mut_refs.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/src/docker/local.rs b/src/docker/local.rs -index f7d0507..913b44f 100644 ---- a/src/docker/local.rs -+++ b/src/docker/local.rs -@@ -1,3 +1,5 @@ -+#![allow(static_mut_refs)] -+ - use std::io; - use std::path::Path; - use std::process::{Command, ExitStatus}; -diff --git a/src/docker/shared.rs b/src/docker/shared.rs -index 7996e1f..f82db29 100644 ---- a/src/docker/shared.rs -+++ b/src/docker/shared.rs -@@ -1,3 +1,5 @@ -+#![allow(static_mut_refs)] -+ - use std::io::Write; - use std::path::{Path, PathBuf}; - use std::process::{Command, ExitStatus, Output}; -diff --git a/src/errors.rs b/src/errors.rs -index bcb4d35..7d09934 100644 ---- a/src/errors.rs -+++ b/src/errors.rs -@@ -1,3 +1,5 @@ -+#![allow(static_mut_refs)] -+ - use crate::docker; - use crate::temp; - -diff --git a/src/temp.rs b/src/temp.rs -index f9a180d..0697720 100644 ---- a/src/temp.rs -+++ b/src/temp.rs -@@ -1,3 +1,5 @@ -+#![allow(static_mut_refs)] -+ - use std::fs; - use std::path::{Path, PathBuf}; -