From 35fbc71592311a4bfa0e329d3428d35c480c3ed3 Mon Sep 17 00:00:00 2001 From: Alexander Lyon Date: Sat, 8 Jun 2024 11:59:53 +0100 Subject: [PATCH] bump version --- .github/workflows/release.yml | 6 +++--- Cargo.lock | 2 +- Cargo.toml | 8 +++++++- crates/litehouse/Cargo.toml | 2 +- plugins/mqtt/Cargo.toml | 3 +-- plugins/persistent-task/Cargo.toml | 1 + plugins/presence/Cargo.toml | 3 +-- plugins/samsung/Cargo.toml | 3 +-- plugins/sonoff/Cargo.toml | 3 +-- plugins/tasmota/Cargo.toml | 3 +-- plugins/weather/Cargo.toml | 3 +-- 11 files changed, 19 insertions(+), 18 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c816275..bc618a9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -62,7 +62,7 @@ jobs: # we specify bash to get pipefail; it guards against the `curl` command # failing. otherwise `sh` won't catch that `curl` returned non-0 shell: bash - run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.15.1/cargo-dist-installer.sh | sh" + run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/arlyon/cargo-dist/releases/download/v0.16.7/cargo-dist-installer.sh | sh" # sure would be cool if github gave us proper conditionals... # so here's a doubly-nested ternary-via-truthiness to try to provide the best possible # functionality based on whether this is a pull_request, and whether it's from a fork. @@ -167,7 +167,7 @@ jobs: submodules: recursive - name: Install cargo-dist shell: bash - run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.15.1/cargo-dist-installer.sh | sh" + run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/arlyon/cargo-dist/releases/download/v0.16.7/cargo-dist-installer.sh | sh" # Get all the local artifacts for the global tasks to use (for e.g. checksums) - name: Fetch local artifacts uses: actions/download-artifact@v4 @@ -212,7 +212,7 @@ jobs: with: submodules: recursive - name: Install cargo-dist - run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.15.1/cargo-dist-installer.sh | sh" + run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/arlyon/cargo-dist/releases/download/v0.16.7/cargo-dist-installer.sh | sh" # Fetch artifacts from scratch-storage - name: Fetch artifacts uses: actions/download-artifact@v4 diff --git a/Cargo.lock b/Cargo.lock index 463c1d1..7e187fa 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1980,7 +1980,7 @@ checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" [[package]] name = "litehouse" -version = "0.1.0" +version = "0.2.0" dependencies = [ "anyhow", "async-trait", diff --git a/Cargo.toml b/Cargo.toml index 6c5da97..7ab41c5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -45,8 +45,9 @@ bin = [ # Config for 'cargo dist' [workspace.metadata.dist] +allow-dirty = ["ci", "msi"] # The preferred cargo-dist version to use in CI (Cargo.toml SemVer syntax) -cargo-dist-version = "0.15.1" +cargo-dist-version = "0.16.7" # CI backends to support ci = "github" # The installers to generate for each app @@ -54,6 +55,7 @@ installers = ["shell", "powershell", "homebrew", "msi"] # Target platforms to build apps for (Rust target-triple syntax) targets = [ "aarch64-apple-darwin", + "aarch64-unknown-linux-gnu", "x86_64-apple-darwin", "x86_64-unknown-linux-gnu", "x86_64-pc-windows-msvc", @@ -62,3 +64,7 @@ targets = [ pr-run-mode = "plan" # Whether to install an updater program install-updater = true + +[workspace.metadata.dist.github-custom-runners] +aarch64-unknown-linux-gnu = "buildjet-8vcpu-ubuntu-2204-arm" +aarch64-unknown-linux-musl = "buildjet-8vcpu-ubuntu-2204-arm" diff --git a/crates/litehouse/Cargo.toml b/crates/litehouse/Cargo.toml index 2eb9fee..a25c84a 100644 --- a/crates/litehouse/Cargo.toml +++ b/crates/litehouse/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "litehouse" -version = "0.1.0" +version = "0.2.0" description = "A lightweight home automation server" edition.workspace = true license.workspace = true diff --git a/plugins/mqtt/Cargo.toml b/plugins/mqtt/Cargo.toml index 1280dbb..afb3a26 100644 --- a/plugins/mqtt/Cargo.toml +++ b/plugins/mqtt/Cargo.toml @@ -1,12 +1,11 @@ [package] name = "mqtt" version = "0.1.0" +publish = false edition.workspace = true license.workspace = true authors.workspace = true homepage.workspace = true repository.workspace = true -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - [dependencies] diff --git a/plugins/persistent-task/Cargo.toml b/plugins/persistent-task/Cargo.toml index bf2fcf3..2ed01c3 100644 --- a/plugins/persistent-task/Cargo.toml +++ b/plugins/persistent-task/Cargo.toml @@ -1,6 +1,7 @@ [package] name = "persistent-task" version = "0.1.0" +publish = false edition.workspace = true license.workspace = true authors.workspace = true diff --git a/plugins/presence/Cargo.toml b/plugins/presence/Cargo.toml index 71d30f8..fef6eed 100644 --- a/plugins/presence/Cargo.toml +++ b/plugins/presence/Cargo.toml @@ -1,12 +1,11 @@ [package] name = "presence" version = "0.1.0" +publish = false edition.workspace = true license.workspace = true authors.workspace = true homepage.workspace = true repository.workspace = true -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - [dependencies] diff --git a/plugins/samsung/Cargo.toml b/plugins/samsung/Cargo.toml index 8140fd8..915dcd4 100644 --- a/plugins/samsung/Cargo.toml +++ b/plugins/samsung/Cargo.toml @@ -1,14 +1,13 @@ [package] name = "samsung" version = "0.1.0" +publish = false edition.workspace = true license.workspace = true authors.workspace = true homepage.workspace = true repository.workspace = true -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - [dependencies] base64 = "0.21.7" litehouse-plugin = { version = "0.1.0", path = "../../crates/plugin" } diff --git a/plugins/sonoff/Cargo.toml b/plugins/sonoff/Cargo.toml index ed7c007..1d6c420 100644 --- a/plugins/sonoff/Cargo.toml +++ b/plugins/sonoff/Cargo.toml @@ -1,12 +1,11 @@ [package] name = "sonoff" version = "0.1.0" +publish = false edition.workspace = true license.workspace = true authors.workspace = true homepage.workspace = true repository.workspace = true -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - [dependencies] diff --git a/plugins/tasmota/Cargo.toml b/plugins/tasmota/Cargo.toml index d9a7b37..2d4c33d 100644 --- a/plugins/tasmota/Cargo.toml +++ b/plugins/tasmota/Cargo.toml @@ -3,14 +3,13 @@ [package] name = "tasmota" version = "0.1.1" +publish = false edition.workspace = true license.workspace = true authors.workspace = true homepage.workspace = true repository.workspace = true -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - [dependencies] litehouse-plugin = { version = "0.1.0", path = "../../crates/plugin" } schemars = "0.8.16" diff --git a/plugins/weather/Cargo.toml b/plugins/weather/Cargo.toml index d30a838..054a85e 100644 --- a/plugins/weather/Cargo.toml +++ b/plugins/weather/Cargo.toml @@ -1,14 +1,13 @@ [package] name = "weather" version = "0.1.1" +publish = false edition.workspace = true license.workspace = true authors.workspace = true homepage.workspace = true repository.workspace = true -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - [dependencies] litehouse-plugin = { version = "0.1.0", path = "../../crates/plugin" } schemars = { version = "0.8.16", default-features = false, features = [