build: add targets (#72)

Deactivated non-working targets, tracking in #73 --------- Signed-off-by: simonsan <[email protected]>
rustic-rs · Nov 29, 2024 · 4108148 · 4108148
1 parent 34aba57
commit 4108148
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 4 deletions.
diff --git a/.cargo/config.toml b/.cargo/config.toml
@@ -3,11 +3,17 @@ rustdocflags = ["--document-private-items"]
 # rustflags = "-C target-cpu=native -D warnings"
 # incremental = true
 
-[env]
-CC_aarch64_unknown_linux_musl = "aarch64-linux-gnu-gcc"
+[target.armv7-unknown-linux-gnueabihf]
+linker = "arm-linux-gnueabihf-gcc"
+
+[target.armv7-unknown-linux-musleabihf]
+linker = "arm-linux-gnueabihf-gcc"
 
 [target.aarch64-unknown-linux-gnu]
 linker = "aarch64-linux-gnu-gcc"
 
 [target.aarch64-unknown-linux-musl]
 linker = "aarch64-linux-gnu-gcc"
+
+[target.i686-unknown-linux-gnu]
+linker = "i686-linux-gnu-gcc"
diff --git a/Cargo.toml b/Cargo.toml
@@ -16,7 +16,7 @@ include = [
 keywords = ["backup", "restic", "cli", "server"]
 license = "AGPL-3.0-or-later"
 repository = "https://github.com/rustic-rs/rustic_server"
-rust-version = "1.70.0"
+rust-version = "1.74.0"
 description = """
 rustic server - a REST server built in rust to use with rustic and restic.
 """
@@ -173,6 +173,7 @@ unused_comparisons = "warn"
 unused_parens = "warn"
 while_true = "warn"
 unreachable_pub = "allow"
+non_local_definitions = "allow"
 
 [workspace.lints.clippy]
 redundant_pub_crate = "allow"

diff --git a/dist-workspace.toml b/dist-workspace.toml
@@ -12,7 +12,7 @@ ci = "github"
 # The installers to generate for each app
 installers = ["shell", "powershell", "homebrew", "msi"]
 # Target platforms to build apps for (Rust target-triple syntax)
-targets = ["aarch64-apple-darwin", "aarch64-unknown-linux-gnu", "aarch64-unknown-linux-musl", "x86_64-apple-darwin", "x86_64-unknown-linux-gnu", "x86_64-unknown-linux-musl", "x86_64-pc-windows-msvc"]
+targets = ["aarch64-apple-darwin", "aarch64-unknown-linux-gnu", "aarch64-unknown-linux-musl", "x86_64-apple-darwin", "x86_64-unknown-linux-gnu", "x86_64-pc-windows-gnu", "x86_64-unknown-linux-musl", "x86_64-pc-windows-msvc"]
 # Path that installers should place binaries in
 install-path = "CARGO_HOME"
 # Whether to install an updater program
@@ -26,10 +26,25 @@ tap = "rustic-rs/homebrew-tap"
 # Publish jobs to run in CI
 publish-jobs = ["homebrew"]
 
+[dist.github-custom-runners]
+aarch64-apple-darwin = "macos-latest"
+aarch64-unknown-linux-gnu = "ubuntu-latest"
+aarch64-unknown-linux-musl = "ubuntu-latest"
+armv7-unknown-linux-gnueabihf = "ubuntu-latest"
+i686-unknown-linux-gnu = "ubuntu-latest"
+x86_64-apple-darwin = "macos-13"
+x86_64-pc-windows-gnu = "windows-latest"
+x86_64-pc-windows-msvc = "windows-latest"
+x86_64-unknown-linux-gnu = "ubuntu-latest"
+x86_64-unknown-linux-musl = "ubuntu-latest"
+
 [dist.dependencies.chocolatey]
 nasm = '*' # Required for building `aws-lc-sys` on Windows
 
 [dist.dependencies.apt]
 gcc-aarch64-linux-gnu = { version = '*', targets = ["aarch64-unknown-linux-gnu", "aarch64-unknown-linux-musl"] }
+gcc-arm-linux-gnueabihf = { version = '*', targets = ["armv7-unknown-linux-gnueabihf"] }
+gcc-i686-linux-gnu = { version = '*', targets = ["i686-unknown-linux-gnu"] }
+gcc-multilib-i686-linux-gnu =  { version = '*', targets = ["i686-unknown-linux-gnu"] }
 musl-tools = { version = '*', targets = ["aarch64-unknown-linux-musl", "x86_64-unknown-linux-musl"] }
 musl-dev = { version = '*', targets = ["aarch64-unknown-linux-musl", "x86_64-unknown-linux-musl"] }
diff --git a/src/lib.rs b/src/lib.rs
@@ -4,6 +4,8 @@
 //!
 //! [Abscissa]: https://github.com/iqlusioninc/abscissa
 
+#![allow(non_local_definitions)]
+
 pub mod acl;
 pub mod application;
 pub mod auth;