Skip to content

Commit f198bba

Browse files
committed
chore(deps): update
1 parent 8d0ca7f commit f198bba

File tree

5 files changed

+19
-22
lines changed

5 files changed

+19
-22
lines changed

.github/workflows/ci.yml

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -21,34 +21,38 @@ jobs:
2121
contents: read
2222
packages: write
2323
steps:
24-
- uses: actions/checkout@v4
24+
- uses: actions/checkout@v5
2525

2626
- name: Install Rust
2727
uses: dtolnay/rust-toolchain@stable
2828
with:
2929
targets: "aarch64-unknown-linux-musl,x86_64-unknown-linux-musl"
3030

31+
- name: Install cargo-binstall
32+
uses: cargo-bins/cargo-binstall@main
33+
34+
- name: Docker setup QEMU
35+
uses: docker/setup-qemu-action@v3
36+
37+
- name: Docker setup Buildx
38+
uses: docker/setup-buildx-action@v3
39+
3140
- uses: Swatinem/rust-cache@v2
3241
with:
3342
cache-on-failure: true
3443

35-
- name: Install dependencies
36-
working-directory: /tmp
37-
run: |
38-
wget https://musl.cc/aarch64-linux-musl-cross.tgz --quiet
39-
tar -xf aarch64-linux-musl-cross.tgz -C . && rm aarch64-linux-musl-cross.tgz
40-
4144
- name: Build Binary
4245
env:
4346
RUSTFLAGS: "-C target-feature=+crt-static"
4447
run: |
48+
cargo binstall --no-confirm cross
49+
4550
mkdir -p binaries/linux/{arm64,amd64}
46-
export PATH=$PATH:/tmp/aarch64-linux-musl-cross/bin
4751
48-
cargo build --release --target aarch64-unknown-linux-musl
52+
cross build --release --target aarch64-unknown-linux-musl
4953
mv target/aarch64-unknown-linux-musl/release/berry-pasty binaries/linux/arm64/berry-pasty
5054
51-
cargo build --release --target x86_64-unknown-linux-musl
55+
cross build --release --target x86_64-unknown-linux-musl
5256
mv target/x86_64-unknown-linux-musl/release/berry-pasty binaries/linux/amd64/berry-pasty
5357
5458
pwd && ls -lhR binaries
@@ -65,12 +69,6 @@ jobs:
6569
name: berry-pasty-x86_64-linux64-musl
6670
path: binaries/linux/amd64/berry-pasty
6771

68-
- name: Docker setup QEMU
69-
uses: docker/setup-qemu-action@v3
70-
71-
- name: Docker setup Buildx
72-
uses: docker/setup-buildx-action@v3
73-
7472
- name: Login to Docker Hub
7573
uses: docker/login-action@v3
7674
with:

Cargo.lock

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

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ version = "0.1.5"
88
anyhow = "1.0"
99
chrono = "0.4"
1010
nanoid = "0.4"
11-
redb = "2.6"
11+
redb = "3.0"
1212
serde = "1.0"
1313
url = "2.5"
1414

src/main.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -251,8 +251,7 @@ async fn main() {
251251
.extract_inner("pasty")
252252
.expect("error loading configuration");
253253

254-
let mut db = Database::create(config.db_path.clone()).expect("error opening database");
255-
db.upgrade().expect("error upgrading database");
254+
let db = Database::create(config.db_path.clone()).expect("error opening database");
256255

257256
service::ensure_table_exists(&db).expect("error ensuring table exists");
258257

src/service.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use std::fmt::Display;
22

33
use anyhow::bail;
4-
use redb::Database;
4+
use redb::{Database, ReadableDatabase};
55
use rocket::State;
66

77
use crate::*;

0 commit comments

Comments
 (0)