From b75a257458edbca26f3890de7eb9959e22ef45f0 Mon Sep 17 00:00:00 2001 From: Tyler Rockwood Date: Thu, 25 Jul 2024 18:26:07 +0000 Subject: [PATCH 1/2] transform/js: Remove fixed version from WASI SDK There is a new v23 of the WASI SDK which resolved the issue in WASI SDK 22. So unpin the version. --- src/transform-sdk/js/README.md | 2 +- src/transform-sdk/js/package_toolchain.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/transform-sdk/js/README.md b/src/transform-sdk/js/README.md index ee53421c08ee1..8afd39d71f749 100644 --- a/src/transform-sdk/js/README.md +++ b/src/transform-sdk/js/README.md @@ -7,7 +7,7 @@ To use this SDK manually here are the steps: ```shell # Compile the C++ -docker run -v `pwd`/..:/src -w /src/js ghcr.io/webassembly/wasi-sdk:wasi-sdk-21 \ +docker run -v `pwd`/..:/src -w /src/js ghcr.io/webassembly/wasi-sdk \ /bin/bash -c 'apt update && apt install -y git && cmake --preset release-static && cmake --build --preset release-static -- redpanda_js_transform -j32' # Convert the JavaScript file into a WebAssembly text file cat user_code.js | ./generate_js_provider.py > js_user_code.wat diff --git a/src/transform-sdk/js/package_toolchain.py b/src/transform-sdk/js/package_toolchain.py index 855ccd51bbb38..00ef0a1b5fde9 100755 --- a/src/transform-sdk/js/package_toolchain.py +++ b/src/transform-sdk/js/package_toolchain.py @@ -4,7 +4,7 @@ This script assumes it's run from the JS SDK root directory (src/transform-sdk/js) and you must have already built the Wasm binary via: -docker run -v `pwd`/..:/src -w /src/js ghcr.io/webassembly/wasi-sdk:wasi-sdk-21 \ +docker run -v `pwd`/..:/src -w /src/js ghcr.io/webassembly/wasi-sdk \ /bin/bash -c 'apt update && apt install -y git && cmake --preset release-static && cmake --build --preset release-static -- redpanda_js_transform' """ From 105635f16fc06a852d113017339f4daf0058bce0 Mon Sep 17 00:00:00 2001 From: Tyler Rockwood Date: Thu, 25 Jul 2024 19:03:27 +0000 Subject: [PATCH 2/2] rpk/transform/buildpack: upgrade js sdk To pull in Full LTO and latest WASI SDK optimizations --- src/go/rpk/pkg/cli/transform/buildpack/buildpack.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/go/rpk/pkg/cli/transform/buildpack/buildpack.go b/src/go/rpk/pkg/cli/transform/buildpack/buildpack.go index 3c7cb0c8a4ea1..1e610a27e00a9 100644 --- a/src/go/rpk/pkg/cli/transform/buildpack/buildpack.go +++ b/src/go/rpk/pkg/cli/transform/buildpack/buildpack.go @@ -53,15 +53,15 @@ var Tinygo = Buildpack{ var JavaScript = Buildpack{ Name: "javascript", // TODO: Find a better place to host these binaries than the tinygo repo - baseURL: "https://github.com/redpanda-data/tinygo/releases/download/js-sdk-v1", + baseURL: "https://github.com/redpanda-data/tinygo/releases/download/js-sdk-v1.1", shaSums: map[string]map[string]string{ "darwin": { - "amd64": "03ae0af869ccdea74c5d80f187b01c797e7327abdf33e8df693836d471105dad", - "arm64": "fa0374389d580eb731f6274b152c4229acb15335e100800c947cf25066c76e2a", + "amd64": "56eb59ddb320c9f8fb4f79910eaeebd68e1d6499d9827b9120ffc6135a8ada03", + "arm64": "deb5ab186aa3da654b04e9613856f83abacd89dc8b99a1d03449697fe135fd6f", }, "linux": { - "amd64": "8c879b804e7b5d749220e5021663bc3a710a4ff36a8a2ea93bbcaa0a311d7160", - "arm64": "c53dc96c5ca18cd788fb0bbff5983b7e909777928dcad3bfd8a20c0c61d654ea", + "amd64": "8480c6f1274cdd8d8410b2b54561dd64911945fa0b4d9d46a1e0acb5a8dc1015", + "arm64": "3426bd8b4fafc085f070b89487bb2198df5bfd9b4efc50c75a05947e3edcb127", }, }, }