From a1eb7ff7fa9057bfc5f91ca1dca0421f1cb5d486 Mon Sep 17 00:00:00 2001 From: Pietro Abate Date: Wed, 10 Dec 2025 14:41:46 +0100 Subject: [PATCH 1/2] manifest: use system instead of bash to call rust build scripts --- etherlink/lib_wasm_runtime/dune | 2 +- manifest/product_etherlink.ml | 2 +- manifest/product_octez.ml | 4 ++-- src/lib_bls12_381/libblst/build.sh | 0 src/rust_deps/dune | 2 +- src/rustzcash_deps/dune | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) mode change 100644 => 100755 src/lib_bls12_381/libblst/build.sh diff --git a/etherlink/lib_wasm_runtime/dune b/etherlink/lib_wasm_runtime/dune index 12153568ebe6..863613f9c552 100644 --- a/etherlink/lib_wasm_runtime/dune +++ b/etherlink/lib_wasm_runtime/dune @@ -31,4 +31,4 @@ (source_tree ../../src/kernel_sdk) (source_tree ../../sdk/rust) (source_tree src)) - (action (no-infer (bash ./build.sh)))) + (action (no-infer (system ./build.sh)))) diff --git a/manifest/product_etherlink.ml b/manifest/product_etherlink.ml index f49f0faa25bf..73c316be15ab 100644 --- a/manifest/product_etherlink.ml +++ b/manifest/product_etherlink.ml @@ -89,7 +89,7 @@ let lib_etherlink_wasm_runtime = [S "source_tree"; S "../../sdk/rust"]; [S "source_tree"; S "src"]; ]; - [S "action"; [S "no-infer"; [S "bash"; S "./build.sh"]]]; + [S "action"; [S "no-infer"; [S "system"; S "./build.sh"]]]; ]; ]) diff --git a/manifest/product_octez.ml b/manifest/product_octez.ml index 65826966578b..a666d6ac5bba 100644 --- a/manifest/product_octez.ml +++ b/manifest/product_octez.ml @@ -525,7 +525,7 @@ let lib_rustzcash = [S "source_tree"; S "include"]; [S "source_tree"; S "src"]; ]; - [S "action"; [S "no-infer"; [S "bash"; S "./build.sh"]]]; + [S "action"; [S "no-infer"; [S "system"; S "./build.sh"]]]; ]; ]) @@ -569,7 +569,7 @@ let octez_rust_deps, lib_wasmer_riscv = [S "source_tree"; S "../kernel_sdk"]; [S "source_tree"; S "../../sdk/rust"]; ]; - [S "action"; [S "no-infer"; [S "bash"; S "./build.sh"]]]; + [S "action"; [S "no-infer"; [S "system"; S "./build.sh"]]]; ]; ] in diff --git a/src/lib_bls12_381/libblst/build.sh b/src/lib_bls12_381/libblst/build.sh old mode 100644 new mode 100755 diff --git a/src/rust_deps/dune b/src/rust_deps/dune index bea693fa87d7..510dd9fdb2d3 100644 --- a/src/rust_deps/dune +++ b/src/rust_deps/dune @@ -25,4 +25,4 @@ (source_tree ../riscv) (source_tree ../kernel_sdk) (source_tree ../../sdk/rust)) - (action (no-infer (bash ./build.sh)))) + (action (no-infer (system ./build.sh)))) diff --git a/src/rustzcash_deps/dune b/src/rustzcash_deps/dune index 9c60b89c8e80..36e3b4e1f16e 100644 --- a/src/rustzcash_deps/dune +++ b/src/rustzcash_deps/dune @@ -20,4 +20,4 @@ (source_tree bin) (source_tree include) (source_tree src)) - (action (no-infer (bash ./build.sh)))) + (action (no-infer (system ./build.sh)))) -- GitLab From e33d57398011566db58f47e7fe7554a90e08990f Mon Sep 17 00:00:00 2001 From: Pietro Abate Date: Wed, 10 Dec 2025 14:49:02 +0100 Subject: [PATCH 2/2] rust: use /bin/sh instead of bash in build.sh rust scripts --- etherlink/lib_wasm_runtime/build.sh | 6 +++--- src/rust_deps/build.sh | 6 +++--- src/rustzcash_deps/build.sh | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/etherlink/lib_wasm_runtime/build.sh b/etherlink/lib_wasm_runtime/build.sh index bc42f3f3d62f..02033ad8419e 100755 --- a/etherlink/lib_wasm_runtime/build.sh +++ b/etherlink/lib_wasm_runtime/build.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/sh # SPDX-FileCopyrightText: 2024 TriliTech # @@ -22,10 +22,10 @@ cargo build --release --locked --target-dir="$CARGO_TARGET_DIR" # Copy the built artifacts to the output directory. cp -f "$CARGO_TARGET_DIR/release/liboctez_evm_node_wasm_runtime.a" "$OUT_DIR/liboctez_evm_node_rust_deps.a" -if [[ -r "$CARGO_TARGET_DIR/release/liboctez_evm_node_wasm_runtime.so" ]]; then +if [ -r "$CARGO_TARGET_DIR/release/liboctez_evm_node_wasm_runtime.so" ]; then cp -f "$CARGO_TARGET_DIR/release/liboctez_evm_node_wasm_runtime.so" "$OUT_DIR/dlloctez_evm_node_rust_deps.so" fi -if [[ -r "$CARGO_TARGET_DIR/release/liboctez_evm_node_wasm_runtime.dylib" ]]; then +if [ -r "$CARGO_TARGET_DIR/release/liboctez_evm_node_wasm_runtime.dylib" ]; then cp -f "$CARGO_TARGET_DIR/release/liboctez_evm_node_wasm_runtime.dylib" "$OUT_DIR/dlloctez_evm_node_rust_deps.so" fi diff --git a/src/rust_deps/build.sh b/src/rust_deps/build.sh index 681770cafeea..e8a3aa2ee845 100755 --- a/src/rust_deps/build.sh +++ b/src/rust_deps/build.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/sh # SPDX-FileCopyrightText: 2024 TriliTech # @@ -22,10 +22,10 @@ cargo build --release --locked --target-dir="$CARGO_TARGET_DIR" # Copy the built artifacts to the output directory. cp -f "$CARGO_TARGET_DIR/release/liboctez_rust_deps.a" "$OUT_DIR/liboctez_rust_deps.a" -if [[ -r "$CARGO_TARGET_DIR/release/liboctez_rust_deps.so" ]]; then +if [ -r "$CARGO_TARGET_DIR/release/liboctez_rust_deps.so" ]; then cp -f "$CARGO_TARGET_DIR/release/liboctez_rust_deps.so" "$OUT_DIR/dlloctez_rust_deps.so" fi -if [[ -r "$CARGO_TARGET_DIR/release/liboctez_rust_deps.dylib" ]]; then +if [ -r "$CARGO_TARGET_DIR/release/liboctez_rust_deps.dylib" ]; then cp -f "$CARGO_TARGET_DIR/release/liboctez_rust_deps.dylib" "$OUT_DIR/dlloctez_rust_deps.so" fi diff --git a/src/rustzcash_deps/build.sh b/src/rustzcash_deps/build.sh index 507a94992fd9..dce8ac252ecf 100755 --- a/src/rustzcash_deps/build.sh +++ b/src/rustzcash_deps/build.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/sh # SPDX-FileCopyrightText: 2024 TriliTech # @@ -22,10 +22,10 @@ cargo build --release --locked --target-dir="$CARGO_TARGET_DIR" # Copy the built artifacts to the output directory. cp -f "$CARGO_TARGET_DIR/release/librustzcash.a" "$OUT_DIR/liboctez_rustzcash_deps.a" -if [[ -r "$CARGO_TARGET_DIR/release/librustzcash.so" ]]; then +if [ -r "$CARGO_TARGET_DIR/release/librustzcash.so" ]; then cp -f "$CARGO_TARGET_DIR/release/librustzcash.so" "$OUT_DIR/dlloctez_rustzcash_deps.so" fi -if [[ -r "$CARGO_TARGET_DIR/release/librustzcash.dylib" ]]; then +if [ -r "$CARGO_TARGET_DIR/release/librustzcash.dylib" ]; then cp -f "$CARGO_TARGET_DIR/release/librustzcash.dylib" "$OUT_DIR/dlloctez_rustzcash_deps.so" fi -- GitLab