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

…ease"

This reverts commit b21f06a, reversing
changes made to 7a7e4e4.

Signed-off-by: Yaroslav Bolyukin <[email protected]>

.github/workflows/release.yml

@@ -54,15 +54,43 @@ jobs:
     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
@@ -71,6 +99,7 @@ jobs:
             os: ubuntu-latest
             bin: jrsonnet
             name: jrsonnet-linux-gnu-amd64
+
           - target: x86_64-unknown-linux-musl
             os: ubuntu-latest
             bin: jrsonnet
@@ -87,16 +116,52 @@ jobs:
       - 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 }}

README.md

@@ -16,10 +16,6 @@ This implementation shows performance better than all existing implementations.
 
 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.toml

@@ -5,6 +5,7 @@ version = "0.3.7"
 authors = ["Yaroslav Bolyukin <[email protected]>"]
 license = "MIT"
 edition = "2018"
+publish = false
 
 [features]
 default = []
@@ -18,5 +19,11 @@ jrsonnet-cli = { path = "../../crates/jrsonnet-cli", version = "0.3.7" }
 # 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.toml

@@ -5,8 +5,12 @@ version = "0.3.7"
 authors = ["Yaroslav Bolyukin <[email protected]>"]
 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/.gitignore

@@ -0,0 +1,2 @@
+/target
+Cargo.lock

crates/jrsonnet-stdlib/Cargo.toml

@@ -5,3 +5,7 @@ version = "0.3.7"
 authors = ["Yaroslav Bolyukin <[email protected]>"]
 license = "MIT"
 edition = "2018"
+
+[features]
+
+[dependencies]