Skip to content

Commit f00c364

Browse files
committed
Bump ureq from 2 to 3. Bump openblas from 0.3.28 to 0.3.30. fix CI
1 parent 04e9b02 commit f00c364

File tree

4 files changed

+28
-11
lines changed

4 files changed

+28
-11
lines changed

.github/workflows/openblas-src.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,5 +141,10 @@ jobs:
141141
sudo apt install -y libopenblas-dev
142142
- name: Install toolchain
143143
uses: dtolnay/[email protected]
144+
# Note: base64ct 1.6.0 is the final version that maintains compatibility with MSRV 1.71.
145+
# This restriction can be lifted when the project's MSRV is updated to 1.84 or higher,
146+
# which is the minimum cargo version supporting MSRV-aware resolution.
144147
- name: cargo test
145-
run: cargo check --manifest-path=openblas-src/Cargo.toml --features=system
148+
run: |
149+
cargo update -p base64ct --precise 1.6.0
150+
cargo check --manifest-path=openblas-src/Cargo.toml --features=system

openblas-build/Cargo.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ cc = "1.0"
1818
flate2 = "1.0.25"
1919
tar = "0.4.38"
2020
thiserror = "2.0"
21-
ureq = { version = "2.8", default-features = false, features = [
22-
"native-certs",
21+
ureq = { version = "3.0", default-features = false, features = [
2322
"native-tls",
2423
"gzip",
2524
] }

openblas-build/src/build.rs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,11 @@ pub enum Target {
137137

138138
// LOONGARCH64:
139139
LOONGSONGENERIC,
140-
LOONGSON3R5,
141140
LOONGSON2K1000,
141+
LOONGSON3R5,
142+
LA64_GENERIC,
143+
LA264,
144+
LA464,
142145

143146
// Elbrus E2000:
144147
E2K,
@@ -280,8 +283,11 @@ impl FromStr for Target {
280283

281284
// LOONGARCH64:
282285
"loongsongeneric" => Self::LOONGSONGENERIC,
283-
"longson3r5" => Self::LOONGSON3R5,
284286
"longson2k1000" => Self::LOONGSON2K1000,
287+
"longson3r5" => Self::LOONGSON3R5,
288+
"la64_generic" => Self::LA64_GENERIC,
289+
"la264" => Self::LA264,
290+
"la464" => Self::LA464,
285291

286292
// Elbrus E2000:
287293
"e2k" => Self::E2K,

openblas-build/src/download.rs

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
use anyhow::Result;
22
use std::path::{Path, PathBuf};
3+
use ureq::{
4+
config::Config,
5+
tls::{TlsConfig, TlsProvider},
6+
};
37

4-
const OPENBLAS_VERSION: &str = "0.3.28";
8+
const OPENBLAS_VERSION: &str = "0.3.30";
59

610
pub fn openblas_source_url() -> String {
711
format!(
@@ -16,6 +20,7 @@ pub fn download(out_dir: &Path) -> Result<PathBuf> {
1620
let buf = get_agent()
1721
.get(&openblas_source_url())
1822
.call()?
23+
.into_body()
1924
.into_reader();
2025
let gz_stream = flate2::read::GzDecoder::new(buf);
2126
let mut ar = tar::Archive::new(gz_stream);
@@ -26,10 +31,12 @@ pub fn download(out_dir: &Path) -> Result<PathBuf> {
2631
}
2732

2833
fn get_agent() -> ureq::Agent {
29-
ureq::AgentBuilder::new()
30-
.tls_connector(std::sync::Arc::new(
31-
native_tls::TlsConnector::new().expect("failed to create TLS connector"),
32-
))
33-
.try_proxy_from_env(true)
34+
Config::builder()
35+
.tls_config(
36+
TlsConfig::builder()
37+
.provider(TlsProvider::NativeTls)
38+
.build(),
39+
)
3440
.build()
41+
.new_agent()
3542
}

0 commit comments

Comments
 (0)