difftreelog
Revert "Merge pull request #44 from bruno-delfino1995/use-clap-prerelease"
in: master
This reverts commit b21f06a79c9b5f758e8d2926f2dd5b2f38af715f, reversing changes made to 7a7e4e4e737dc8d1bf43a689e079fe882bfb2aeb.
7 files changed
.github/workflows/release.ymldiffbeforeafterboth1name: 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 }}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 # Tier 158 - aarch64-unknown-linux-gnu59 - i686-pc-windows-gnu60 - i686-pc-windows-msvc61 - i686-unknown-linux-gnu62 - x86_64-apple-darwin63 - x86_64-pc-windows-gnu64 - x86_64-pc-windows-msvc65 - x86_64-unknown-linux-gnu6667 # Other68 - x86_64-unknown-linux-musl69 include:70 - target: aarch64-unknown-linux-gnu71 os: ubuntu-latest72 bin: jrsonnet73 name: jrsonnet-linux-gnu-aarch6474 - target: i686-pc-windows-gnu75 os: windows-latest76 bin: jrsonnet.exe77 name: jrsonnet-windows-gnu-i686.exe78 - target: i686-pc-windows-msvc79 os: windows-latest80 bin: jrsonnet.exe81 name: jrsonnet-windows-msvc-i686.exe82 - target: i686-unknown-linux-gnu83 os: ubuntu-latest84 bin: jrsonnet85 name: jrsonnet-linux-gnu-i68686 - target: x86_64-apple-darwin87 os: macOS-latest88 bin: jrsonnet89 name: jrsonnet-darwin-amd6490 - target: x86_64-pc-windows-gnu91 os: windows-latest92 bin: jrsonnet.exe93 name: jrsonnet-windows-gnu-amd64.exe94 - target: x86_64-pc-windows-msvc95 os: windows-latest96 bin: jrsonnet.exe97 name: jrsonnet-windows-msvc-amd64.exe98 - target: x86_64-unknown-linux-gnu99 os: ubuntu-latest100 bin: jrsonnet101 name: jrsonnet-linux-gnu-amd64102103 - target: x86_64-unknown-linux-musl104 os: ubuntu-latest105 bin: jrsonnet106 name: jrsonnet-linux-musl-amd64107 runs-on: ${{ matrix.os }}108 steps:109 - name: Install stable toolchain110 uses: actions-rs/toolchain@v1111 with:112 toolchain: stable113 override: true114 target: ${{ matrix.target }}115116 - name: Checkout117 uses: actions/checkout@v2118119 - name: Linux x86 cross compiler120 if: ${{ matrix.target == 'i686-unknown-linux-gnu' }}121 run: sudo apt install gcc-multilib122123 - name: Windows x86 cross compiler124 if: ${{ matrix.target == 'i686-pc-windows-gnu' }}125 uses: egor-tensin/setup-mingw@v2126 with:127 platform: x86128129 - name: ARM cross compiler130 if: ${{ matrix.target == 'aarch64-unknown-linux-gnu' }}131 uses: actions-rs/cargo@v1132 with:133 command: install134 args: cross135136 - name: ARM gcc137 if: ${{ matrix.target == 'aarch64-unknown-linux-gnu' }}138 run: sudo apt install gcc-aarch64-linux-gnu139140 - name: Run ARM build141 if: ${{ matrix.target == 'aarch64-unknown-linux-gnu' }}142 shell: bash143 run: cross build --bin=jrsonnet --release --target ${{ matrix.target }}144145 - name: Run ARM strip146 if: ${{ matrix.target == 'aarch64-unknown-linux-gnu' }}147 shell: bash148 run: aarch64-linux-gnu-strip target/${{ matrix.target }}/release/${{ matrix.bin }}149150 - name: Run build151 if: ${{ matrix.target != 'aarch64-unknown-linux-gnu' }}152 uses: actions-rs/cargo@v1153 with:154 command: build155 args: --bin=jrsonnet --release --target ${{ matrix.target }}156157 - name: Run strip158 if: ${{ matrix.target != 'aarch64-unknown-linux-gnu' }}159 shell: bash160 run: strip target/${{ matrix.target }}/release/${{ matrix.bin }}161162 - name: Package163 shell: bash164 run: |165 cd target/${{ matrix.target }}/release166167 cp ${{ matrix.bin }} ../../../${{ matrix.name }}168 cd -169170 - name: Generate SHA-256171 run: shasum -a 256 ${{ matrix.name }} > ${{ matrix.name }}.sha256172173 - name: Publish174 uses: softprops/action-gh-release@v1175 with:176 draft: true177 files: "jrsonnet*"178 env:179 GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}Cargo.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",
]
@@ -270,9 +266,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"
@@ -420,9 +416,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",
]
README.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
cmds/jrsonnet/Cargo.tomldiffbeforeafterboth--- a/cmds/jrsonnet/Cargo.toml
+++ b/cmds/jrsonnet/Cargo.toml
@@ -5,6 +5,7 @@
authors = ["Yaroslav Bolyukin <iam@lach.pw>"]
license = "MIT"
edition = "2018"
+publish = false
[features]
default = []
@@ -18,5 +19,11 @@
# 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"
crates/jrsonnet-cli/Cargo.tomldiffbeforeafterboth--- a/crates/jrsonnet-cli/Cargo.toml
+++ b/crates/jrsonnet-cli/Cargo.toml
@@ -5,8 +5,12 @@
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"
crates/jrsonnet-interner/.gitignorediffbeforeafterboth--- /dev/null
+++ b/crates/jrsonnet-interner/.gitignore
@@ -0,0 +1,2 @@
+/target
+Cargo.lock
crates/jrsonnet-stdlib/Cargo.tomldiffbeforeafterboth--- a/crates/jrsonnet-stdlib/Cargo.toml
+++ b/crates/jrsonnet-stdlib/Cargo.toml
@@ -5,3 +5,7 @@
authors = ["Yaroslav Bolyukin <iam@lach.pw>"]
license = "MIT"
edition = "2018"
+
+[features]
+
+[dependencies]