Fix builds (#609)

.cargo/config.toml

@@ -1,2 +1,14 @@
 [target.wasm32-wasi]
 runner = ["./scripts/wasmtime-wrapper.sh"]
+
+[target.aarch64-unknown-linux-gnu]
+linker = "aarch64-linux-gnu-gcc"
+
+[target.aarch64-unknown-linux-musl]
+linker = "rust-lld"
+
+[target.i686-unknown-linux-gnu]
+linker = "i686-linux-gnu-gcc"
+
+[target.'cfg(all(target_env = "msvc", target_os = "windows"))']
+rustflags = ["-C", "target-feature=+crt-static"]

.github/workflows/release.yml

@@ -117,6 +117,10 @@ jobs:
       - uses: actions/checkout@v4
         with:
           submodules: recursive
+      - uses: swatinem/rust-cache@v2
+        with:
+          key: ${{ join(matrix.targets, '-') }}
+          cache-provider: ${{ matrix.cache_provider }}
       - name: Install cargo-dist
         run: ${{ matrix.install_dist }}
       # Get the dist-manifest

dist-workspace.toml

@@ -1,13 +1,28 @@
 [workspace]
-members = ["cargo:."]
+members = ["cargo:minijinja-cli"]
 
 # Config for 'cargo dist'
 [dist]
+# The preferred cargo-dist version to use in CI (Cargo.toml SemVer syntax)
 cargo-dist-version = "0.23.0"
+# CI backends to support
 ci = "github"
+# The installers to generate for each app
 installers = ["shell", "powershell"]
-targets = ["aarch64-apple-darwin", "aarch64-unknown-linux-gnu", "aarch64-unknown-linux-musl", "arm-unknown-linux-musleabihf", "armv7-unknown-linux-gnueabihf", "armv7-unknown-linux-musleabihf", "x86_64-apple-darwin", "powerpc64-unknown-linux-gnu", "x86_64-unknown-linux-gnu", "x86_64-unknown-linux-musl", "x86_64-pc-windows-msvc", "i686-unknown-linux-gnu", "i686-unknown-linux-musl", "i686-pc-windows-msvc"]
+# 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", "i686-unknown-linux-gnu", "i686-unknown-linux-musl", "i686-pc-windows-msvc"]
+# Which actions to run on pull requests
 pr-run-mode = "plan"
+# Build only the required packages, and individually
 precise-builds = true
+# Path that installers should place binaries in
 install-path = ["$MINIJINJA_CLI_INSTALL_DIR/bin", "~/.local/bin"]
+# Whether to install an updater program
 install-updater = false
+
+[dist.dependencies.apt]
+gcc-aarch64-linux-gnu = { version = '*' }
+gcc-i686-linux-gnu = { version = '*' }
+gcc-arm-linux-gnueabi = { version = '*' }
+gcc-arm-linux-gnueabihf = { version = '*' }
+musl-tools = { version = '*' }