git.delta.rocks / jrsonnet / refs/commits / 1bf5e01612ea

difftreelog

Merge commit 'e1eaabb7a756db2b7db5ffbe5e30bb53c72168b0' into gc-v2

Yaroslav Bolyukin2021-06-12parents: #e3dd72e #e1eaabb.patch.diff
in: master

12 files changed

modified.github/workflows/release.ymldiffbeforeafterboth
before · .github/workflows/release.yml
1name: CI23on: [push]45jobs:6  test:7    name: Test Suite8    runs-on: ubuntu-latest9    steps:10      - name: Checkout sources11        uses: actions/checkout@v212      - name: Install stable toolchain13        uses: actions-rs/toolchain@v114        with:15          toolchain: stable16          override: true17      - name: Run tests18        uses: actions-rs/cargo@v119        with:20          command: test21          args: --all2223  cargo-release:24    if: startsWith(github.ref, 'refs/tags/')25    needs: [test]26    runs-on: ubuntu-latest27    steps:28      - name: Checkout sources29        uses: actions/checkout@v230      - name: Install stable toolchain31        uses: actions-rs/toolchain@v132        with:33          toolchain: stable34          override: true35      - name: Install cargo release command36        uses: actions-rs/cargo@v137        with:38          command: install39          args: cargo-release40      - name: Run cargo login41        uses: actions-rs/cargo@v142        with:43          command: login44          args: ${{ secrets.CARGO_TOKEN }}45      - name: Publish crates46        uses: actions-rs/cargo@v147        with:48          command: release49          args: --no-dev-version --skip-push --skip-tag --no-confirm5051  github-release:52    if: startsWith(github.ref, 'refs/tags/')53    needs: [test]54    strategy:55      matrix:56        target:57          - x86_64-apple-darwin58          - x86_64-pc-windows-msvc59          - x86_64-unknown-linux-gnu60          - x86_64-unknown-linux-musl61        include:62          - target: x86_64-apple-darwin63            os: macOS-latest64            bin: jrsonnet65            name: jrsonnet-darwin-amd6466          - target: x86_64-pc-windows-msvc67            os: windows-latest68            bin: jrsonnet.exe69            name: jrsonnet-windows-msvc-amd64.exe70          - target: x86_64-unknown-linux-gnu71            os: ubuntu-latest72            bin: jrsonnet73            name: jrsonnet-linux-gnu-amd6474          - target: x86_64-unknown-linux-musl75            os: ubuntu-latest76            bin: jrsonnet77            name: jrsonnet-linux-musl-amd6478    runs-on: ${{ matrix.os }}79    steps:80      - name: Install stable toolchain81        uses: actions-rs/toolchain@v182        with:83          toolchain: stable84          override: true85          target: ${{ matrix.target }}8687      - name: Checkout88        uses: actions/checkout@v28990      - name: Run build91        uses: actions-rs/cargo@v192        with:93          command: build94          args: --bin=jrsonnet --release --target ${{ matrix.target }}9596      - name: Package97        shell: bash98        run: |99          strip target/${{ matrix.target }}/release/${{ matrix.bin }}100          cd target/${{ matrix.target }}/release101102          cp ${{ matrix.bin }} ../../../${{ matrix.name }}103          cd -104105      - name: Generate SHA-256106        run: shasum -a 256 ${{ matrix.name }} > ${{ matrix.name }}.sha256107108      - name: Publish109        uses: softprops/action-gh-release@v1110        with:111          draft: true112          files: "jrsonnet*"113        env:114          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
modifiedCargo.lockdiffbeforeafterboth
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -65,8 +65,7 @@
 [[package]]
 name = "clap"
 version = "3.0.0-beta.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bd1061998a501ee7d4b6d449020df3266ca3124b941ec56cf2005c3779ca142"
+source = "git+https://github.com/clap-rs/clap?rev=92f744cc49d12d32261010d355dc215a6d2487b9#92f744cc49d12d32261010d355dc215a6d2487b9"
 dependencies = [
  "atty",
  "bitflags",
@@ -77,15 +76,13 @@
  "strsim",
  "termcolor",
  "textwrap",
- "unicode-width",
  "vec_map",
 ]
 
 [[package]]
 name = "clap_derive"
 version = "3.0.0-beta.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "370f715b81112975b1b69db93e0b56ea4cd4e5002ac43b2da8474106a54096a1"
+source = "git+https://github.com/clap-rs/clap?rev=92f744cc49d12d32261010d355dc215a6d2487b9#92f744cc49d12d32261010d355dc215a6d2487b9"
 dependencies = [
  "heck",
  "proc-macro-error",
@@ -97,8 +94,7 @@
 [[package]]
 name = "clap_generate"
 version = "3.0.0-beta.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adf420f8b687b628d2915ccfd43a660c437a170432e3fbcb66944e8717a0d68f"
+source = "git+https://github.com/clap-rs/clap?rev=92f744cc49d12d32261010d355dc215a6d2487b9#92f744cc49d12d32261010d355dc215a6d2487b9"
 dependencies = [
  "clap",
 ]
@@ -166,7 +162,7 @@
 
 [[package]]
 name = "jrsonnet"
-version = "0.3.7"
+version = "0.3.8"
 dependencies = [
  "clap",
  "clap_generate",
@@ -179,7 +175,7 @@
 
 [[package]]
 name = "jrsonnet-cli"
-version = "0.3.7"
+version = "0.3.8"
 dependencies = [
  "clap",
  "jrsonnet-evaluator",
@@ -188,7 +184,7 @@
 
 [[package]]
 name = "jrsonnet-evaluator"
-version = "0.3.7"
+version = "0.3.8"
 dependencies = [
  "annotate-snippets",
  "anyhow",
@@ -209,7 +205,7 @@
 
 [[package]]
 name = "jrsonnet-interner"
-version = "0.3.7"
+version = "0.3.8"
 dependencies = [
  "gc",
  "rustc-hash",
@@ -218,7 +214,7 @@
 
 [[package]]
 name = "jrsonnet-parser"
-version = "0.3.7"
+version = "0.3.8"
 dependencies = [
  "gc",
  "jrsonnet-interner",
@@ -230,11 +226,11 @@
 
 [[package]]
 name = "jrsonnet-stdlib"
-version = "0.3.7"
+version = "0.3.8"
 
 [[package]]
 name = "jrsonnet-types"
-version = "0.3.7"
+version = "0.3.8"
 dependencies = [
  "gc",
  "peg",
@@ -242,7 +238,7 @@
 
 [[package]]
 name = "jsonnet"
-version = "0.3.7"
+version = "0.3.8"
 dependencies = [
  "jrsonnet-evaluator",
  "jrsonnet-interner",
@@ -288,9 +284,9 @@
 
 [[package]]
 name = "os_str_bytes"
-version = "2.4.0"
+version = "3.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afb2e1c3ee07430c2cf76151675e583e0f19985fa6efae47d6848a3e2c824f85"
+checksum = "e293568965aea261bdf010db17df7030e3c9a275c415d51d6112f7cf9b7af012"
 
 [[package]]
 name = "pathdiff"
@@ -450,9 +446,9 @@
 
 [[package]]
 name = "textwrap"
-version = "0.12.1"
+version = "0.13.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "203008d98caf094106cfaba70acfed15e18ed3ddb7d94e49baec153a2b462789"
+checksum = "cd05616119e612a8041ef58f2b578906cc2531a6069047ae092cfb86a325d835"
 dependencies = [
  "unicode-width",
 ]
modifiedREADME.mddiffbeforeafterboth
--- a/README.md
+++ b/README.md
@@ -16,10 +16,6 @@
 
 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
modifiedbindings/jsonnet/Cargo.tomldiffbeforeafterboth
--- a/bindings/jsonnet/Cargo.toml
+++ b/bindings/jsonnet/Cargo.toml
@@ -1,16 +1,16 @@
 [package]
 name = "jsonnet"
 description = "Rust implementation of libjsonnet.so"
-version = "0.3.7"
+version = "0.3.8"
 authors = ["Yaroslav Bolyukin <iam@lach.pw>"]
 license = "MIT"
 edition = "2018"
 publish = false
 
 [dependencies]
-jrsonnet-interner = { path = "../../crates/jrsonnet-interner", version = "0.3.7" }
-jrsonnet-evaluator = { path = "../../crates/jrsonnet-evaluator", version = "0.3.7" }
-jrsonnet-parser = { path = "../../crates/jrsonnet-parser", version = "0.3.7" }
+jrsonnet-interner = { path = "../../crates/jrsonnet-interner", version = "0.3.8" }
+jrsonnet-evaluator = { path = "../../crates/jrsonnet-evaluator", version = "0.3.8" }
+jrsonnet-parser = { path = "../../crates/jrsonnet-parser", version = "0.3.8" }
 
 [lib]
 crate-type = ["cdylib"]
modifiedcmds/jrsonnet/Cargo.tomldiffbeforeafterboth
--- a/cmds/jrsonnet/Cargo.toml
+++ b/cmds/jrsonnet/Cargo.toml
@@ -1,10 +1,11 @@
 [package]
 name = "jrsonnet"
 description = "Rust jsonnet implementation"
-version = "0.3.7"
+version = "0.3.8"
 authors = ["Yaroslav Bolyukin <iam@lach.pw>"]
 license = "MIT"
 edition = "2018"
+publish = false
 
 [features]
 default = []
@@ -12,11 +13,17 @@
 mimalloc = []
 
 [dependencies]
-jrsonnet-evaluator = { path = "../../crates/jrsonnet-evaluator", version = "0.3.7" }
-jrsonnet-parser = { path = "../../crates/jrsonnet-parser", version = "0.3.7" }
-jrsonnet-cli = { path = "../../crates/jrsonnet-cli", version = "0.3.7" }
+jrsonnet-evaluator = { path = "../../crates/jrsonnet-evaluator", version = "0.3.8" }
+jrsonnet-parser = { path = "../../crates/jrsonnet-parser", version = "0.3.8" }
+jrsonnet-cli = { path = "../../crates/jrsonnet-cli", version = "0.3.8" }
 # TODO: Fix mimalloc compile errors, and use them
 mimallocator = { version = "0.1.3", optional = true }
 thiserror = "1.0"
-clap = "3.0.0-beta.2"
-clap_generate = "3.0.0-beta.2"
+
+[dependencies.clap]
+git = "https://github.com/clap-rs/clap"
+rev = "92f744cc49d12d32261010d355dc215a6d2487b9"
+
+[dependencies.clap_generate]
+git = "https://github.com/clap-rs/clap"
+rev = "92f744cc49d12d32261010d355dc215a6d2487b9"
modifiedcrates/jrsonnet-cli/Cargo.tomldiffbeforeafterboth
--- a/crates/jrsonnet-cli/Cargo.toml
+++ b/crates/jrsonnet-cli/Cargo.toml
@@ -1,12 +1,16 @@
 [package]
 name = "jrsonnet-cli"
 description = "Utilities for building jrsonnet CLIs"
-version = "0.3.7"
+version = "0.3.8"
 authors = ["Yaroslav Bolyukin <iam@lach.pw>"]
 license = "MIT"
 edition = "2018"
+publish = false
 
 [dependencies]
-jrsonnet-evaluator = { path = "../../crates/jrsonnet-evaluator", version = "0.3.7", features = ["explaining-traces"] }
-jrsonnet-parser = { path = "../../crates/jrsonnet-parser", version = "0.3.7" }
-clap = "3.0.0-beta.2"
+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"
modifiedcrates/jrsonnet-evaluator/Cargo.tomldiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/Cargo.toml
+++ b/crates/jrsonnet-evaluator/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "jrsonnet-evaluator"
 description = "jsonnet interpreter"
-version = "0.3.7"
+version = "0.3.8"
 authors = ["Yaroslav Bolyukin <iam@lach.pw>"]
 license = "MIT"
 edition = "2018"
@@ -24,10 +24,10 @@
 unstable = []
 
 [dependencies]
-jrsonnet-interner = { path = "../jrsonnet-interner", version = "0.3.7" }
-jrsonnet-parser = { path = "../jrsonnet-parser", version = "0.3.7" }
-jrsonnet-stdlib = { path = "../jrsonnet-stdlib", version = "0.3.7" }
-jrsonnet-types = { path = "../jrsonnet-types", version = "0.3.7" }
+jrsonnet-interner = { path = "../jrsonnet-interner", version = "0.3.8" }
+jrsonnet-parser = { path = "../jrsonnet-parser", version = "0.3.8" }
+jrsonnet-stdlib = { path = "../jrsonnet-stdlib", version = "0.3.8" }
+jrsonnet-types = { path = "../jrsonnet-types", version = "0.3.8" }
 pathdiff = "0.2.0"
 
 md5 = "0.7.0"
@@ -61,7 +61,7 @@
 optional = true
 
 [build-dependencies]
-jrsonnet-parser = { path = "../jrsonnet-parser", features = ["serialize", "deserialize"], version = "0.3.7" }
-jrsonnet-stdlib = { path = "../jrsonnet-stdlib", version = "0.3.7" }
+jrsonnet-parser = { path = "../jrsonnet-parser", features = ["serialize", "deserialize"], version = "0.3.8" }
+jrsonnet-stdlib = { path = "../jrsonnet-stdlib", version = "0.3.8" }
 serde = "1.0"
 bincode = "1.3.1"
addedcrates/jrsonnet-interner/.gitignorediffbeforeafterboth
--- /dev/null
+++ b/crates/jrsonnet-interner/.gitignore
@@ -0,0 +1,2 @@
+/target
+Cargo.lock
modifiedcrates/jrsonnet-interner/Cargo.tomldiffbeforeafterboth
--- a/crates/jrsonnet-interner/Cargo.toml
+++ b/crates/jrsonnet-interner/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "jrsonnet-interner"
 description = "Jrsonnet string interning"
-version = "0.3.7"
+version = "0.3.8"
 authors = ["Yaroslav Bolyukin <iam@lach.pw>"]
 license = "MIT"
 edition = "2018"
modifiedcrates/jrsonnet-parser/Cargo.tomldiffbeforeafterboth
--- a/crates/jrsonnet-parser/Cargo.toml
+++ b/crates/jrsonnet-parser/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "jrsonnet-parser"
 description = "jsonnet language parser and AST"
-version = "0.3.7"
+version = "0.3.8"
 authors = ["Yaroslav Bolyukin <iam@lach.pw>"]
 license = "MIT"
 edition = "2018"
@@ -12,7 +12,7 @@
 deserialize = ["serde"]
 
 [dependencies]
-jrsonnet-interner = { path = "../jrsonnet-interner", version = "0.3.7" }
+jrsonnet-interner = { path = "../jrsonnet-interner", version = "0.3.8" }
 
 peg = "0.7.0"
 unescape = "0.1.0"
@@ -21,4 +21,4 @@
 gc = { version = "0.4.1", features = ["derive"] }
 
 [dev-dependencies]
-jrsonnet-stdlib = { path = "../jrsonnet-stdlib", version = "0.3.7" }
+jrsonnet-stdlib = { path = "../jrsonnet-stdlib", version = "0.3.8" }
modifiedcrates/jrsonnet-stdlib/Cargo.tomldiffbeforeafterboth
--- a/crates/jrsonnet-stdlib/Cargo.toml
+++ b/crates/jrsonnet-stdlib/Cargo.toml
@@ -1,7 +1,11 @@
 [package]
 name = "jrsonnet-stdlib"
 description = "jsonnet standard library packaged as crate"
-version = "0.3.7"
+version = "0.3.8"
 authors = ["Yaroslav Bolyukin <iam@lach.pw>"]
 license = "MIT"
 edition = "2018"
+
+[features]
+
+[dependencies]
modifiedcrates/jrsonnet-types/Cargo.tomldiffbeforeafterboth
--- a/crates/jrsonnet-types/Cargo.toml
+++ b/crates/jrsonnet-types/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "jrsonnet-types"
 description = "Jrsonnet type system definition"
-version = "0.3.7"
+version = "0.3.8"
 authors = ["Yaroslav Bolyukin <iam@lach.pw>"]
 license = "MIT"
 edition = "2018"