difftreelog
Merge pull request #44 from bruno-delfino1995/use-clap-prerelease
in: master
Use clap prerelease instead of git ref
7 files changed
.github/workflows/release.ymldiffbeforeafterboth--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -54,43 +54,15 @@
strategy:
matrix:
target:
- # Tier 1
- - aarch64-unknown-linux-gnu
- - i686-pc-windows-gnu
- - i686-pc-windows-msvc
- - i686-unknown-linux-gnu
- x86_64-apple-darwin
- - x86_64-pc-windows-gnu
- x86_64-pc-windows-msvc
- x86_64-unknown-linux-gnu
-
- # Other
- x86_64-unknown-linux-musl
include:
- - target: aarch64-unknown-linux-gnu
- os: ubuntu-latest
- bin: jrsonnet
- name: jrsonnet-linux-gnu-aarch64
- - target: i686-pc-windows-gnu
- os: windows-latest
- bin: jrsonnet.exe
- name: jrsonnet-windows-gnu-i686.exe
- - target: i686-pc-windows-msvc
- os: windows-latest
- bin: jrsonnet.exe
- name: jrsonnet-windows-msvc-i686.exe
- - target: i686-unknown-linux-gnu
- os: ubuntu-latest
- bin: jrsonnet
- name: jrsonnet-linux-gnu-i686
- target: x86_64-apple-darwin
os: macOS-latest
bin: jrsonnet
name: jrsonnet-darwin-amd64
- - target: x86_64-pc-windows-gnu
- os: windows-latest
- bin: jrsonnet.exe
- name: jrsonnet-windows-gnu-amd64.exe
- target: x86_64-pc-windows-msvc
os: windows-latest
bin: jrsonnet.exe
@@ -99,7 +71,6 @@
os: ubuntu-latest
bin: jrsonnet
name: jrsonnet-linux-gnu-amd64
-
- target: x86_64-unknown-linux-musl
os: ubuntu-latest
bin: jrsonnet
@@ -115,53 +86,17 @@
- name: Checkout
uses: actions/checkout@v2
-
- - name: Linux x86 cross compiler
- if: ${{ matrix.target == 'i686-unknown-linux-gnu' }}
- run: sudo apt install gcc-multilib
- - name: Windows x86 cross compiler
- if: ${{ matrix.target == 'i686-pc-windows-gnu' }}
- uses: egor-tensin/setup-mingw@v2
- with:
- platform: x86
-
- - name: ARM cross compiler
- if: ${{ matrix.target == 'aarch64-unknown-linux-gnu' }}
- uses: actions-rs/cargo@v1
- with:
- command: install
- args: cross
-
- - name: ARM gcc
- if: ${{ matrix.target == 'aarch64-unknown-linux-gnu' }}
- run: sudo apt install gcc-aarch64-linux-gnu
-
- - name: Run ARM build
- if: ${{ matrix.target == 'aarch64-unknown-linux-gnu' }}
- shell: bash
- run: cross build --bin=jrsonnet --release --target ${{ matrix.target }}
-
- - name: Run ARM strip
- if: ${{ matrix.target == 'aarch64-unknown-linux-gnu' }}
- shell: bash
- run: aarch64-linux-gnu-strip target/${{ matrix.target }}/release/${{ matrix.bin }}
-
- name: Run build
- if: ${{ matrix.target != 'aarch64-unknown-linux-gnu' }}
uses: actions-rs/cargo@v1
with:
command: build
args: --bin=jrsonnet --release --target ${{ matrix.target }}
-
- - name: Run strip
- if: ${{ matrix.target != 'aarch64-unknown-linux-gnu' }}
- shell: bash
- run: strip target/${{ matrix.target }}/release/${{ matrix.bin }}
- name: Package
shell: bash
run: |
+ strip target/${{ matrix.target }}/release/${{ matrix.bin }}
cd target/${{ matrix.target }}/release
cp ${{ matrix.bin }} ../../../${{ matrix.name }}
Cargo.lockdiffbeforeafterboth65[[package]]65[[package]]66name = "clap"66name = "clap"67version = "3.0.0-beta.2"67version = "3.0.0-beta.2"68source = "git+https://github.com/clap-rs/clap?rev=92f744cc49d12d32261010d355dc215a6d2487b9#92f744cc49d12d32261010d355dc215a6d2487b9"68source = "registry+https://github.com/rust-lang/crates.io-index"69checksum = "4bd1061998a501ee7d4b6d449020df3266ca3124b941ec56cf2005c3779ca142"69dependencies = [70dependencies = [70 "atty",71 "atty",71 "bitflags",72 "bitflags",76 "strsim",77 "strsim",77 "termcolor",78 "termcolor",78 "textwrap",79 "textwrap",80 "unicode-width",79 "vec_map",81 "vec_map",80]82]818382[[package]]84[[package]]83name = "clap_derive"85name = "clap_derive"84version = "3.0.0-beta.2"86version = "3.0.0-beta.2"85source = "git+https://github.com/clap-rs/clap?rev=92f744cc49d12d32261010d355dc215a6d2487b9#92f744cc49d12d32261010d355dc215a6d2487b9"87source = "registry+https://github.com/rust-lang/crates.io-index"88checksum = "370f715b81112975b1b69db93e0b56ea4cd4e5002ac43b2da8474106a54096a1"86dependencies = [89dependencies = [87 "heck",90 "heck",88 "proc-macro-error",91 "proc-macro-error",94[[package]]97[[package]]95name = "clap_generate"98name = "clap_generate"96version = "3.0.0-beta.2"99version = "3.0.0-beta.2"97source = "git+https://github.com/clap-rs/clap?rev=92f744cc49d12d32261010d355dc215a6d2487b9#92f744cc49d12d32261010d355dc215a6d2487b9"100source = "registry+https://github.com/rust-lang/crates.io-index"101checksum = "adf420f8b687b628d2915ccfd43a660c437a170432e3fbcb66944e8717a0d68f"98dependencies = [102dependencies = [99 "clap",103 "clap",100]104]266270267[[package]]271[[package]]268name = "os_str_bytes"272name = "os_str_bytes"269version = "3.0.0"273version = "2.4.0"270source = "registry+https://github.com/rust-lang/crates.io-index"274source = "registry+https://github.com/rust-lang/crates.io-index"271checksum = "e293568965aea261bdf010db17df7030e3c9a275c415d51d6112f7cf9b7af012"275checksum = "afb2e1c3ee07430c2cf76151675e583e0f19985fa6efae47d6848a3e2c824f85"272276273[[package]]277[[package]]274name = "pathdiff"278name = "pathdiff"416420417[[package]]421[[package]]418name = "textwrap"422name = "textwrap"419version = "0.13.4"423version = "0.12.1"420source = "registry+https://github.com/rust-lang/crates.io-index"424source = "registry+https://github.com/rust-lang/crates.io-index"421checksum = "cd05616119e612a8041ef58f2b578906cc2531a6069047ae092cfb86a325d835"425checksum = "203008d98caf094106cfaba70acfed15e18ed3ddb7d94e49baec153a2b462789"422dependencies = [426dependencies = [423 "unicode-width",427 "unicode-width",424]428]README.mddiffbeforeafterboth--- a/README.md
+++ b/README.md
@@ -16,6 +16,10 @@
In the end, it's always fun to implement something in Rust.
+## How to install?
+
+We build x64 binaries for Apple, Windows MSVC, and Linux GNU during the release process. If your system is one of those, you can check out the [latest release](https://github.com/CertainLach/jrsonnet/releases/latest) to get your pre-built binary. Otherwise, you'll need to have a rust toolchain and install the package through cargo with `cargo install jrsonnet`.
+
## Compliance with the [specification](https://jsonnet.org/ref/spec.html)
- Passes all the original `examples` tests
cmds/jrsonnet/Cargo.tomldiffbeforeafterboth--- a/cmds/jrsonnet/Cargo.toml
+++ b/cmds/jrsonnet/Cargo.toml
@@ -5,7 +5,6 @@
authors = ["Yaroslav Bolyukin <iam@lach.pw>"]
license = "MIT"
edition = "2018"
-publish = false
[features]
default = []
@@ -19,11 +18,5 @@
# TODO: Fix mimalloc compile errors, and use them
mimallocator = { version = "0.1.3", optional = true }
thiserror = "1.0"
-
-[dependencies.clap]
-git = "https://github.com/clap-rs/clap"
-rev = "92f744cc49d12d32261010d355dc215a6d2487b9"
-
-[dependencies.clap_generate]
-git = "https://github.com/clap-rs/clap"
-rev = "92f744cc49d12d32261010d355dc215a6d2487b9"
+clap = "3.0.0-beta.2"
+clap_generate = "3.0.0-beta.2"
crates/jrsonnet-cli/Cargo.tomldiffbeforeafterboth--- a/crates/jrsonnet-cli/Cargo.toml
+++ b/crates/jrsonnet-cli/Cargo.toml
@@ -5,12 +5,8 @@
authors = ["Yaroslav Bolyukin <iam@lach.pw>"]
license = "MIT"
edition = "2018"
-publish = false
[dependencies]
jrsonnet-evaluator = { path = "../../crates/jrsonnet-evaluator", version = "0.3.6", features = ["explaining-traces"] }
jrsonnet-parser = { path = "../../crates/jrsonnet-parser", version = "0.3.6" }
-
-[dependencies.clap]
-git = "https://github.com/clap-rs/clap"
-rev = "92f744cc49d12d32261010d355dc215a6d2487b9"
+clap = "3.0.0-beta.2"
crates/jrsonnet-interner/.gitignorediffbeforeafterboth--- a/crates/jrsonnet-interner/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/target
-Cargo.lock
crates/jrsonnet-stdlib/Cargo.tomldiffbeforeafterboth--- a/crates/jrsonnet-stdlib/Cargo.toml
+++ b/crates/jrsonnet-stdlib/Cargo.toml
@@ -5,7 +5,3 @@
authors = ["Yaroslav Bolyukin <iam@lach.pw>"]
license = "MIT"
edition = "2018"
-
-[features]
-
-[dependencies]