git.delta.rocks / jrsonnet / refs/commits / f7013a5afedf

difftreelog

Revert "Merge pull request #44 from bruno-delfino1995/use-clap-prerelease"

Yaroslav Bolyukin2021-06-11parent: #6794ed5.patch.diff
in: master
This reverts commit b21f06a79c9b5f758e8d2926f2dd5b2f38af715f, reversing
changes made to 7a7e4e4e737dc8d1bf43a689e079fe882bfb2aeb.

7 files changed

modified.github/workflows/release.ymldiffbeforeafterboth
54 strategy:54 strategy:
55 matrix:55 matrix:
56 target:56 target:
57 # Tier 1
58 - aarch64-unknown-linux-gnu
59 - i686-pc-windows-gnu
60 - i686-pc-windows-msvc
61 - i686-unknown-linux-gnu
57 - x86_64-apple-darwin62 - x86_64-apple-darwin
63 - x86_64-pc-windows-gnu
58 - x86_64-pc-windows-msvc64 - x86_64-pc-windows-msvc
59 - x86_64-unknown-linux-gnu65 - x86_64-unknown-linux-gnu
66
67 # Other
60 - x86_64-unknown-linux-musl68 - x86_64-unknown-linux-musl
61 include:69 include:
70 - target: aarch64-unknown-linux-gnu
71 os: ubuntu-latest
72 bin: jrsonnet
73 name: jrsonnet-linux-gnu-aarch64
74 - target: i686-pc-windows-gnu
75 os: windows-latest
76 bin: jrsonnet.exe
77 name: jrsonnet-windows-gnu-i686.exe
78 - target: i686-pc-windows-msvc
79 os: windows-latest
80 bin: jrsonnet.exe
81 name: jrsonnet-windows-msvc-i686.exe
82 - target: i686-unknown-linux-gnu
83 os: ubuntu-latest
84 bin: jrsonnet
85 name: jrsonnet-linux-gnu-i686
62 - target: x86_64-apple-darwin86 - target: x86_64-apple-darwin
63 os: macOS-latest87 os: macOS-latest
64 bin: jrsonnet88 bin: jrsonnet
65 name: jrsonnet-darwin-amd6489 name: jrsonnet-darwin-amd64
90 - target: x86_64-pc-windows-gnu
91 os: windows-latest
92 bin: jrsonnet.exe
93 name: jrsonnet-windows-gnu-amd64.exe
66 - target: x86_64-pc-windows-msvc94 - target: x86_64-pc-windows-msvc
67 os: windows-latest95 os: windows-latest
68 bin: jrsonnet.exe96 bin: jrsonnet.exe
87 - name: Checkout116 - name: Checkout
88 uses: actions/checkout@v2117 uses: actions/checkout@v2
118
119 - name: Linux x86 cross compiler
120 if: ${{ matrix.target == 'i686-unknown-linux-gnu' }}
121 run: sudo apt install gcc-multilib
122
123 - name: Windows x86 cross compiler
124 if: ${{ matrix.target == 'i686-pc-windows-gnu' }}
125 uses: egor-tensin/setup-mingw@v2
126 with:
127 platform: x86
128
129 - name: ARM cross compiler
130 if: ${{ matrix.target == 'aarch64-unknown-linux-gnu' }}
131 uses: actions-rs/cargo@v1
132 with:
133 command: install
134 args: cross
135
136 - name: ARM gcc
137 if: ${{ matrix.target == 'aarch64-unknown-linux-gnu' }}
138 run: sudo apt install gcc-aarch64-linux-gnu
139
140 - name: Run ARM build
141 if: ${{ matrix.target == 'aarch64-unknown-linux-gnu' }}
142 shell: bash
143 run: cross build --bin=jrsonnet --release --target ${{ matrix.target }}
144
145 - name: Run ARM strip
146 if: ${{ matrix.target == 'aarch64-unknown-linux-gnu' }}
147 shell: bash
148 run: aarch64-linux-gnu-strip target/${{ matrix.target }}/release/${{ matrix.bin }}
89149
90 - name: Run build150 - name: Run build
151 if: ${{ matrix.target != 'aarch64-unknown-linux-gnu' }}
91 uses: actions-rs/cargo@v1152 uses: actions-rs/cargo@v1
92 with:153 with:
93 command: build154 command: build
94 args: --bin=jrsonnet --release --target ${{ matrix.target }}155 args: --bin=jrsonnet --release --target ${{ matrix.target }}
156
157 - name: Run strip
158 if: ${{ matrix.target != 'aarch64-unknown-linux-gnu' }}
159 shell: bash
160 run: strip target/${{ matrix.target }}/release/${{ matrix.bin }}
95161
96 - name: Package162 - name: Package
97 shell: bash163 shell: bash
98 run: |164 run: |
99 strip target/${{ matrix.target }}/release/${{ matrix.bin }}165 cd target/${{ matrix.target }}/release
100 cd target/${{ matrix.target }}/release166
101167 cp ${{ matrix.bin }} ../../../${{ matrix.name }}
102 cp ${{ matrix.bin }} ../../../${{ matrix.name }}168 cd -
103 cd -
104169
105 - name: Generate SHA-256170 - name: Generate SHA-256
106 run: shasum -a 256 ${{ matrix.name }} > ${{ matrix.name }}.sha256171 run: shasum -a 256 ${{ matrix.name }} > ${{ matrix.name }}.sha256
modifiedCargo.lockdiffbeforeafterboth
65[[package]]65[[package]]
66name = "clap"66name = "clap"
67version = "3.0.0-beta.2"67version = "3.0.0-beta.2"
68source = "registry+https://github.com/rust-lang/crates.io-index"68source = "git+https://github.com/clap-rs/clap?rev=92f744cc49d12d32261010d355dc215a6d2487b9#92f744cc49d12d32261010d355dc215a6d2487b9"
69checksum = "4bd1061998a501ee7d4b6d449020df3266ca3124b941ec56cf2005c3779ca142"
70dependencies = [69dependencies = [
71 "atty",70 "atty",
72 "bitflags",71 "bitflags",
77 "strsim",76 "strsim",
78 "termcolor",77 "termcolor",
79 "textwrap",78 "textwrap",
80 "unicode-width",
81 "vec_map",79 "vec_map",
82]80]
8381
84[[package]]82[[package]]
85name = "clap_derive"83name = "clap_derive"
86version = "3.0.0-beta.2"84version = "3.0.0-beta.2"
87source = "registry+https://github.com/rust-lang/crates.io-index"85source = "git+https://github.com/clap-rs/clap?rev=92f744cc49d12d32261010d355dc215a6d2487b9#92f744cc49d12d32261010d355dc215a6d2487b9"
88checksum = "370f715b81112975b1b69db93e0b56ea4cd4e5002ac43b2da8474106a54096a1"
89dependencies = [86dependencies = [
90 "heck",87 "heck",
91 "proc-macro-error",88 "proc-macro-error",
97[[package]]94[[package]]
98name = "clap_generate"95name = "clap_generate"
99version = "3.0.0-beta.2"96version = "3.0.0-beta.2"
100source = "registry+https://github.com/rust-lang/crates.io-index"97source = "git+https://github.com/clap-rs/clap?rev=92f744cc49d12d32261010d355dc215a6d2487b9#92f744cc49d12d32261010d355dc215a6d2487b9"
101checksum = "adf420f8b687b628d2915ccfd43a660c437a170432e3fbcb66944e8717a0d68f"
102dependencies = [98dependencies = [
103 "clap",99 "clap",
104]100]
270266
271[[package]]267[[package]]
272name = "os_str_bytes"268name = "os_str_bytes"
273version = "2.4.0"269version = "3.0.0"
274source = "registry+https://github.com/rust-lang/crates.io-index"270source = "registry+https://github.com/rust-lang/crates.io-index"
275checksum = "afb2e1c3ee07430c2cf76151675e583e0f19985fa6efae47d6848a3e2c824f85"271checksum = "e293568965aea261bdf010db17df7030e3c9a275c415d51d6112f7cf9b7af012"
276272
277[[package]]273[[package]]
278name = "pathdiff"274name = "pathdiff"
420416
421[[package]]417[[package]]
422name = "textwrap"418name = "textwrap"
423version = "0.12.1"419version = "0.13.4"
424source = "registry+https://github.com/rust-lang/crates.io-index"420source = "registry+https://github.com/rust-lang/crates.io-index"
425checksum = "203008d98caf094106cfaba70acfed15e18ed3ddb7d94e49baec153a2b462789"421checksum = "cd05616119e612a8041ef58f2b578906cc2531a6069047ae092cfb86a325d835"
426dependencies = [422dependencies = [
427 "unicode-width",423 "unicode-width",
428]424]
modifiedREADME.mddiffbeforeafterboth
1616
17In the end, it's always fun to implement something in Rust.17In the end, it's always fun to implement something in Rust.
1818
19## How to install?
20
21We 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`.
22
23## Compliance with the [specification](https://jsonnet.org/ref/spec.html)19## Compliance with the [specification](https://jsonnet.org/ref/spec.html)
2420
25- Passes all the original `examples` tests21- Passes all the original `examples` tests
modifiedcmds/jrsonnet/Cargo.tomldiffbeforeafterboth
5authors = ["Yaroslav Bolyukin <iam@lach.pw>"]5authors = ["Yaroslav Bolyukin <iam@lach.pw>"]
6license = "MIT"6license = "MIT"
7edition = "2018"7edition = "2018"
8publish = false
89
9[features]10[features]
10default = []11default = []
19mimallocator = { version = "0.1.3", optional = true }20mimallocator = { version = "0.1.3", optional = true }
20thiserror = "1.0"21thiserror = "1.0"
22
21clap = "3.0.0-beta.2"23[dependencies.clap]
24git = "https://github.com/clap-rs/clap"
25rev = "92f744cc49d12d32261010d355dc215a6d2487b9"
26
22clap_generate = "3.0.0-beta.2"27[dependencies.clap_generate]
28git = "https://github.com/clap-rs/clap"
29rev = "92f744cc49d12d32261010d355dc215a6d2487b9"
2330
modifiedcrates/jrsonnet-cli/Cargo.tomldiffbeforeafterboth
5authors = ["Yaroslav Bolyukin <iam@lach.pw>"]5authors = ["Yaroslav Bolyukin <iam@lach.pw>"]
6license = "MIT"6license = "MIT"
7edition = "2018"7edition = "2018"
8publish = false
89
9[dependencies]10[dependencies]
10jrsonnet-evaluator = { path = "../../crates/jrsonnet-evaluator", version = "0.3.7", features = ["explaining-traces"] }11jrsonnet-evaluator = { path = "../../crates/jrsonnet-evaluator", version = "0.3.6", features = ["explaining-traces"] }
11jrsonnet-parser = { path = "../../crates/jrsonnet-parser", version = "0.3.7" }12jrsonnet-parser = { path = "../../crates/jrsonnet-parser", version = "0.3.6" }
12clap = "3.0.0-beta.2"13
14[dependencies.clap]
15git = "https://github.com/clap-rs/clap"
16rev = "92f744cc49d12d32261010d355dc215a6d2487b9"
1317
addedcrates/jrsonnet-interner/.gitignorediffbeforeafterboth

no changes

modifiedcrates/jrsonnet-stdlib/Cargo.tomldiffbeforeafterboth
6license = "MIT"6license = "MIT"
7edition = "2018"7edition = "2018"
8
9[features]
10
11[dependencies]
812