Skip to content

Commit a05b8ae

Browse files
Merge branch 'main' into al2023
2 parents 7458aa4 + 69e8d7e commit a05b8ae

15 files changed

Lines changed: 450 additions & 128 deletions

File tree

.github/workflows/test.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -257,6 +257,13 @@ jobs:
257257
run: |
258258
cargo build --release
259259
260+
- name: Upload build as artifact
261+
uses: actions/upload-artifact@v4
262+
if: success()
263+
with:
264+
name: rig-${{ matrix.config.os }}
265+
path: target/release/rig
266+
260267
- name: Install rig
261268
run: |
262269
sudo cp target/release/rig /usr/local/bin/

Cargo.lock

Lines changed: 156 additions & 23 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
[package]
33
name = "rig"
4-
version = "0.8.0-beta"
4+
version = "0.8.0"
55
edition = "2021"
66
authors = ["Gábor Csárdi <csardi.gabor@gmail.com>"]
77
license = "MIT"
@@ -37,7 +37,7 @@ directories = "4.0.1"
3737
# gzip compression/decompression
3838
flate2 = "1.0"
3939
# xz compression/decompression
40-
xz2 = "0.1"
40+
xz2 = { version = "0.1", features = ["static"] }
4141
# run external commands and pipe their output
4242
duct = "0.13.5"
4343
# to set the mtime of files when downloading
@@ -64,13 +64,10 @@ rand = "0.8.5"
6464
# deserialize R files
6565
rds2rust = "0.1.41"
6666
regex = "1.5.4"
67-
# HTTP
67+
# HTTP (non-Windows: rustls to avoid OpenSSL dep; Windows: native-tls (SChannel) to avoid ring build issues on aarch64)
6868
reqwest = { version = "0.11", features = [
6969
"json",
7070
"stream",
71-
"rustls-tls",
72-
"hyper-rustls",
73-
"rustls-tls-native-roots",
7471
], default-features = false }
7572
# SQLite database for caching
7673
rusqlite = { version = "0.32", features = ["bundled"] }
@@ -97,7 +94,15 @@ version-ranges = "0.1.2"
9794
# progress bars
9895
indicatif = "0.17"
9996

97+
[target.'cfg(not(windows))'.dependencies]
98+
reqwest = { version = "0.11", features = [
99+
"rustls-tls",
100+
"hyper-rustls",
101+
"rustls-tls-native-roots",
102+
], default-features = false }
103+
100104
[target.'cfg(windows)'.dependencies]
105+
reqwest = { version = "0.11", features = ["native-tls"], default-features = false }
101106
is_elevated = "0.1.2"
102107
remove_dir_all = "0.7.0"
103108
whoami = "1.4.1"

0 commit comments

Comments
 (0)