docs: improve try-it.sh

Mcdostone · Mcdostone · commit 8c2ceb2dc62e · 2025-03-21T23:36:14.000+01:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -15,15 +15,15 @@ env:
   RUST_BACKTRACE: 1
   RUSTFLAGS: "-D warnings"
   RUSTDOCFLAGS: '--deny warnings'
-  MINIMUM_SUPPORTED_RUST_VERSION: 1.80.1
+  MINIMUM_SUPPORTED_RUST_VERSION: 1.85.0
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
 
-  check-each-package:
+  check:
     name: Check ${{ matrix.package }}
     runs-on: ubuntu-latest
     strategy:
@@ -34,6 +34,7 @@ jobs:
           - "yozefu-command"
           - "yozefu-tui"
           - "yozefu-wasm-types"
+          - "yozefu"
     steps:
     - uses: actions/checkout@v4
     - uses: actions-rust-lang/setup-rust-toolchain@v1
@@ -43,18 +44,6 @@ jobs:
     - name: Run cargo check
       run: cargo check --locked --release --package ${{ matrix.package }}
 
-  check:
-    runs-on: ubuntu-latest
-    needs: [check-each-package]
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions-rust-lang/setup-rust-toolchain@v1
-        with:
-          toolchain: stable
-      - uses: Swatinem/rust-cache@v2
-      - name: Run cargo check
-        run: cargo check --all-features --locked --release --all
-
   build:
     name: Build w/o features
     needs: check
@@ -103,20 +92,11 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      #- name: Install libclang-dev
-      #  if: matrix.platforms.target == 'aarch64-unknown-linux-gnu'
-      #  run: |
-      #    sudo apt-get install -y libclang-16-dev
       - uses: houseabsolute/actions-rust-cross@v1
-        # if: (github.event.pull_request.base.ref  == 'main' && matrix.platforms.os == 'macos-latest-large') == false
         with:
           target: ${{ matrix.platforms.target }}
           args: "--locked ${{ matrix.platforms.features }}"
           strip: true
-        env:
-          KRB5_CV_ATTR_CONSTRUCTOR_DESTRUCTOR: yes
-          AC_CV_FUNC_REGCOMP: yes
-          AC_CV_PRINTF_POSITIONAL: yes
 
   clippy:
     needs: check
@@ -134,7 +114,7 @@ jobs:
 
   license:
     needs: check
-    name: Clippy
+    name: License
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
diff --git a/.github/workflows/code-coverage.yml b/.github/workflows/code-coverage.yml
@@ -13,7 +13,7 @@ env:
   RUST_BACKTRACE: 1
   RUSTFLAGS: "-D warnings"
   RUSTDOCFLAGS: '--deny warnings'
-  MINIMUM_SUPPORTED_RUST_VERSION: 1.80.1
+  MINIMUM_SUPPORTED_RUST_VERSION: 1.85.0
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
diff --git a/.github/workflows/developer-experience.yml b/.github/workflows/developer-experience.yml
@@ -5,7 +5,7 @@ env:
   RUST_BACKTRACE: 1
   RUSTFLAGS: "-D warnings"
   RUSTDOCFLAGS: '--deny warnings'
-  MINIMUM_SUPPORTED_RUST_VERSION: 1.80.1
+  MINIMUM_SUPPORTED_RUST_VERSION: 1.85.0
   GOLANG_VERSION: 1.23.3
   JS_VERSION: 22
 
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -5,7 +5,7 @@ env:
   RUST_BACKTRACE: 1
   RUSTFLAGS: "-D warnings"
   RUSTDOCFLAGS: '--deny warnings'
-  MINIMUM_SUPPORTED_RUST_VERSION: 1.80.1
+  MINIMUM_SUPPORTED_RUST_VERSION: 1.85.0
   DOCKER_REGISTRY: ghcr.io
 
 permissions:
@@ -73,9 +73,9 @@ jobs:
           - os: ubuntu-latest
             target: x86_64-unknown-linux-gnu
             features: ""
-          - os: ubuntu-latest
+          - os: ubuntu-24.04-arm
             target: aarch64-unknown-linux-gnu
-            features: "--no-default-features --features ssl-vendored"
+            features: ""
           - os: windows-latest
             target: x86_64-pc-windows-gnu
             features: "--no-default-features"
diff --git a/.github/workflows/security.yml b/.github/workflows/security.yml
@@ -5,7 +5,7 @@ env:
   RUST_BACKTRACE: 1
   RUSTFLAGS: "-D warnings"
   RUSTDOCFLAGS: '--deny warnings'
-  MINIMUM_SUPPORTED_RUST_VERSION: 1.80.1
+  MINIMUM_SUPPORTED_RUST_VERSION: 1.85.0
 
 on:
   schedule:
diff --git a/.github/workflows/semver-checks.yml b/.github/workflows/semver-checks.yml
@@ -5,7 +5,7 @@ env:
   RUST_BACKTRACE: 1
   RUSTFLAGS: "-D warnings"
   RUSTDOCFLAGS: '--deny warnings'
-  MINIMUM_SUPPORTED_RUST_VERSION: 1.80.1
+  MINIMUM_SUPPORTED_RUST_VERSION: 1.85.0
 
 permissions:
   packages: write
diff --git a/.github/workflows/tag.yml b/.github/workflows/tag.yml
@@ -5,7 +5,7 @@ env:
   RUST_BACKTRACE: 1
   RUSTFLAGS: "-D warnings"
   RUSTDOCFLAGS: '--deny warnings'
-  MINIMUM_SUPPORTED_RUST_VERSION: 1.80.1
+  MINIMUM_SUPPORTED_RUST_VERSION: 1.85.0
 
 permissions:
   contents: write
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Dockerfile b/Dockerfile
@@ -7,13 +7,12 @@ RUN --mount=type=bind,source=crates,target=crates \
     --mount=type=cache,target=/usr/local/cargo/registry/ \
     <<EOF
 set -e
-apt-get update && apt-get install --no-install-recommends -y build-essential cmake libzstd-dev libclang-dev libsasl2-dev libssl-dev pkg-config
+apt-get update && apt-get install --no-install-recommends -y build-essential cmake
 cargo build --release --all-features --locked
 cp ./target/release/yozf /tmp/yozf
 EOF
 
 
-
 FROM debian:bookworm-slim AS final
 ARG UID=10001
 RUN adduser \
diff --git a/crates/command/Cargo.toml b/crates/command/Cargo.toml
@@ -39,6 +39,8 @@ rdkafka = { version = "0.37.0", features = [
     "cmake-build",
     "libz-static",
     "curl-static",
+    "zstd",
+    "external-lz4"
 ] }
 extism = { version = "1.10.0" }
 indexmap = "2.8.0"
diff --git a/docs/try-it.sh b/docs/try-it.sh
@@ -66,15 +66,6 @@ function fallback_produce {
     wait
 }
 
-# Make sure these commands are installed
-function check_commands_are_installed {
-    for cmd in docker git bash sed jq curl; do
-        if ! command -v $cmd &> /dev/null; then
-            echo " ❌ This script requires programs to be installed on your machine. Unfortunately, I was not able to find '$cmd'. Install '$cmd' and try again."
-            exit 1
-        fi
-    done
-}
 
 # The latest version of the tool
 function latest_version {
@@ -117,63 +108,83 @@ function clone_repository {
     fi
 }
 
-check_commands_are_installed
 
+for cmd in bash jq curl; do
+    if ! command -v $cmd &> /dev/null; then
+        echo " ❌ This script requires programs to be installed on your machine. Unfortunately, I was not able to find '$cmd'. Install '$cmd' and try again."
+        ready=1
+    fi
+done
 
-if [ "$BASH_SOURCE" = "" ]; then
-    clone_repository
-    bash /tmp/yozefu/docs/try-it.sh
-    exit 0
-fi
 
-repo=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )/.." &> /dev/null && pwd )
-if [ ! -f "$repo/Cargo.toml" ]; then
-    clone_repository
-    cp "$( dirname -- "${BASH_SOURCE[0]}" )/try-it.sh" /tmp/yozefu/docs/try-it.sh
-    bash /tmp/yozefu/docs/try-it.sh
+ready=0
+missing=""
+for cmd in docker git sed; do
+    if ! command -v $cmd &> /dev/null; then
+        missing="$missing $cmd"
+    fi
+done
+if [ "$missing" != "" ]; then
+        missing=$(echo "$missing" | xargs)
+        echo " ℹ️ For a better experience, I inbite you to install the commands '$missing'. With these commands installed, you'll be able to try yozefu with a Kafka cluster."
+        ready=1
 fi
 
-topic="public-french-addresses"
-query="kafka"
-type="json"
+if [ "$ready" = "0" ]; then
+    if [ "$BASH_SOURCE" = "" ]; then
+        clone_repository
+        bash /tmp/yozefu/docs/try-it.sh
+        exit 0
+    fi
 
-if [ $# -ge 1 ]; then
-    query="$1"
-fi
+    repo=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )/.." &> /dev/null && pwd )
+    if [ ! -f "$repo/Cargo.toml" ]; then
+        clone_repository
+        cp "$( dirname -- "${BASH_SOURCE[0]}" )/try-it.sh" /tmp/yozefu/docs/try-it.sh
+        bash /tmp/yozefu/docs/try-it.sh
+    fi
 
-if [ $# -ge 2 ]; then
-    type="$2"
-fi
+    topic="public-french-addresses"
+    query="kafka"
+    type="json"
 
-if [ $# -ge 3 ]; then
-    topic="$3"
-fi
+    if [ $# -ge 1 ]; then
+        query="$1"
+    fi
 
-if [ $# -ge 4 ]; then
-    url="$4"
-fi
+    if [ $# -ge 2 ]; then
+        type="$2"
+    fi
 
+    if [ $# -ge 3 ]; then
+        topic="$3"
+    fi
 
-echo " 📦 Repository is '$repo'"
-echo " 🐋 Starting kafka"
-docker compose -f "${repo}/compose.yml" up kafka schema-registry -d --wait --no-recreate
-docker compose -f "${repo}/compose.yml" exec -T kafka \
-  /usr/bin/kafka-topics \
-  --create --if-not-exists          \
-  --bootstrap-server localhost:9092 \
-  --partitions 3                    \
-  --topic "${topic}"
+    if [ $# -ge 4 ]; then
+        url="$4"
+    fi
 
-if jbang --version &> /dev/null; then
-    echo " 🤖 jbang run ${repo}/docs/schemas/MyProducer.java --type $type --topic $topic $query"
-    jbang run "${repo}/docs/schemas/MyProducer.java" --type "$type" --topic "$topic" "$query"
-else
-    echo " ℹ️ About to use the default producer 'kafka-console-producer.sh'. Install jbang to create a kafka producer using the schema registry."
-    echo " 🏡 Searching french addresses matching the query '${query}'"
-    echo " 📣 About to producing records to topic '${topic}'"
-    fallback_produce "$topic" "$query"
-fi
 
+    echo " 📦 Repository is '$repo'"
+    echo " 🐋 Starting kafka"
+    docker compose -f "${repo}/compose.yml" up kafka schema-registry -d --wait --no-recreate
+    docker compose -f "${repo}/compose.yml" exec -T kafka \
+      /usr/bin/kafka-topics \
+      --create --if-not-exists          \
+      --bootstrap-server localhost:9092 \
+      --partitions 3                    \
+      --topic "${topic}"
+
+    if jbang --version &> /dev/null; then
+        echo " 🤖 jbang run ${repo}/docs/schemas/MyProducer.java --type $type --topic $topic $query"
+        jbang run "${repo}/docs/schemas/MyProducer.java" --type "$type" --topic "$topic" "$query"
+    else
+        echo " ℹ️ About to use the default producer 'kafka-console-producer.sh'. Install jbang to create a kafka producer using the schema registry."
+        echo " 🏡 Searching french addresses matching the query '${query}'"
+        echo " 📣 About to producing records to topic '${topic}'"
+        fallback_produce "$topic" "$query"
+    fi
+fi
 
 # Invite to try the tool
 if ! command -v cargo &> /dev/null
