Skip to content

Commit

Permalink
Remove duplicates, smaller smaller cli binary, new install location (#…
Browse files Browse the repository at this point in the history
  • Loading branch information
mitsuhiko authored Oct 25, 2024
1 parent 4d12ba5 commit 4c9c604
Show file tree
Hide file tree
Showing 7 changed files with 72 additions and 131 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,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.22.1/cargo-dist-installer.sh | sh"
run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.23.0/cargo-dist-installer.sh | sh"
- name: Cache cargo-dist
uses: actions/upload-artifact@v4
with:
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ All notable changes to MiniJinja are documented here.
simple cases. #606
- `minijinja-cli` now has a `--syntax-help` argument that prints out the
primer on the syntax. #607
- `minijinja-cli` now installs to `~/.local/bin` by default. #608
- Made the c-bindings compatible with wasm compilation. #603
- `String`/`Cow<str>` argument types will no longer implicitly convert
keyword arguments to string form. This was an unintended foot gun. #605
Expand Down
163 changes: 46 additions & 117 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 1 addition & 11 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,6 @@ members = ["minijinja", "examples/*", "benchmarks", "minijinja-*"]
exclude = ["examples/README.md"]
resolver = "2"

# Config for 'cargo dist'
[workspace.metadata.dist]
cargo-dist-version = "0.22.1"
ci = "github"
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"]
pr-run-mode = "plan"
precise-builds = true
install-path = "CARGO_HOME"
install-updater = false

[profile.release]
strip = true

Expand All @@ -27,3 +16,4 @@ opt-level = 3
[profile.dist]
inherits = "release"
lto = "thin"
panic = "abort"
13 changes: 13 additions & 0 deletions dist-workspace.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
[workspace]
members = ["cargo:."]

# Config for 'cargo dist'
[dist]
cargo-dist-version = "0.23.0"
ci = "github"
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"]
pr-run-mode = "plan"
precise-builds = true
install-path = ["$MINIJINJA_CLI_INSTALL_DIR/bin", "~/.local/bin"]
install-updater = false
Loading

0 comments on commit 4c9c604

Please sign in to comment.