diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 052a4f6..7d2bcab 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,6 +23,9 @@ jobs: with: version: 10 + - name: Set up rust + run: rustup update + # https://github.com/tauri-apps/tauri-action?tab=readme-ov-file#usage # https://docs.github.com/en/actions/using-github-hosted-runners/using-github-hosted-runners/customizing-github-hosted-runners#installing-software-on-ubuntu-runners - name: Install tauri dependencies @@ -52,6 +55,9 @@ jobs: with: version: 10 + - name: Set up rust + run: rustup update + - name: Build run: ./meta/build diff --git a/Cargo.toml b/Cargo.toml index b734df4..9af9412 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,10 +1,10 @@ [workspace] -resolver = "2" +resolver = "3" members = ["gdn", "gdn-cli", "gdn-app/src-tauri"] [workspace.package] version = "0.0.0" -edition = "2021" +edition = "2024" [workspace.dependencies] anyhow = "1.0.95" diff --git a/gdn/src/data.rs b/gdn/src/data.rs index a405bee..1b8ba87 100644 --- a/gdn/src/data.rs +++ b/gdn/src/data.rs @@ -10,7 +10,7 @@ use directories::ProjectDirs; pub use self::{ datadir::{LockedDataDir, UnlockedDataDir}, - v1::{load_state, save_state, VERSION}, + v1::{VERSION, load_state, save_state}, }; fn migrate(dir: &LockedDataDir) -> anyhow::Result<()> { diff --git a/gdn/src/data/datadir.rs b/gdn/src/data/datadir.rs index a49d560..6b38341 100644 --- a/gdn/src/data/datadir.rs +++ b/gdn/src/data/datadir.rs @@ -6,9 +6,9 @@ use std::{ path::{Path, PathBuf}, }; -use anyhow::{anyhow, bail, Context}; -use rand::{distr::Alphanumeric, Rng}; -use serde::{de::DeserializeOwned, Serialize}; +use anyhow::{Context, anyhow, bail}; +use rand::{Rng, distr::Alphanumeric}; +use serde::{Serialize, de::DeserializeOwned}; use super::lockfile::LockFile; diff --git a/gdn/src/data/v0.rs b/gdn/src/data/v0.rs index f8d81db..a6a452d 100644 --- a/gdn/src/data/v0.rs +++ b/gdn/src/data/v0.rs @@ -1,6 +1,6 @@ // Just the empty directory -use super::{v1, LockedDataDir}; +use super::{LockedDataDir, v1}; pub const VERSION: u32 = 0;