3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-06-05 09:21:39 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #6318 from penpot/ladybenko-10781-rust-devenv

Browse source 
🔧 Improve Rust dev env
This commit is contained in:
Andrey Antukh 2025-04-17 08:48:50 +02:00 • committed by GitHub
commit 43a75b64b4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
docker/devenv/Dockerfile
View file

@ -10,6 +10,7 @@ ENV NODE_VERSION=v22.14.0 \
CLJFMT_VERSION=0.13.0 \ CLJFMT_VERSION=0.13.0 \
RUSTUP_VERSION=1.27.1 \ RUSTUP_VERSION=1.27.1 \
RUST_VERSION=1.85.0 \ RUST_VERSION=1.85.0 \
EMSCRIPTEN_VERSION=4.0.6 \
LANG=en_US.UTF-8 \ LANG=en_US.UTF-8 \
LC_ALL=en_US.UTF-8 LC_ALL=en_US.UTF-8
@ -269,8 +270,8 @@ WORKDIR /usr/local
RUN set -eux; \ RUN set -eux; \
git clone https://github.com/emscripten-core/emsdk.git; \ git clone https://github.com/emscripten-core/emsdk.git; \
cd emsdk; \ cd emsdk; \
./emsdk install latest; \ ./emsdk install $EMSCRIPTEN_VERSION; \
./emsdk activate latest; \ ./emsdk activate $EMSCRIPTEN_VERSION; \
rustup target add wasm32-unknown-emscripten; rustup target add wasm32-unknown-emscripten;
WORKDIR /home WORKDIR /home

3
render-wasm/_build_env
View file

@ -24,7 +24,7 @@ EMSDK_QUIET=1 . /usr/local/emsdk/emsdk_env.sh;
export EM_CACHE="/tmp/emsdk_cache"; export EM_CACHE="/tmp/emsdk_cache";
_CARGO_PARAMS="--target=wasm32-unknown-emscripten"; _CARGO_PARAMS="";
if [ "$_BUILD_MODE" = "release" ]; then if [ "$_BUILD_MODE" = "release" ]; then
_CARGO_PARAMS="--release $_CARGO_PARAMS" _CARGO_PARAMS="--release $_CARGO_PARAMS"
@ -40,4 +40,3 @@ fi
export EMCC_CFLAGS; export EMCC_CFLAGS;
export _CARGO_PARAMS; export _CARGO_PARAMS;
export SKIA_BINARIES_URL="https://github.com/penpot/skia-binaries/releases/download/0.81.0-3/skia-binaries-24dee32a277b6c7b5357-wasm32-unknown-emscripten-gl-svg-textlayout-binary-cache.tar.gz"

5
render-wasm/build
View file

@ -4,7 +4,10 @@ set -x
_SCRIPT_DIR=$(dirname $0); _SCRIPT_DIR=$(dirname $0);
pushd $_SCRIPT_DIR; pushd $_SCRIPT_DIR;
. ./_build_env . ./_build_env
export CARGO_BUILD_TARGET=${CARGO_BUILD_TARGET:-"wasm32-unknown-emscripten"};
export SKIA_BINARIES_URL=${SKIA_BINARIES_URL:-"https://github.com/penpot/skia-binaries/releases/download/0.81.0-3/skia-binaries-24dee32a277b6c7b5357-wasm32-unknown-emscripten-gl-svg-textlayout-binary-cache.tar.gz"}
cargo build $_CARGO_PARAMS cargo build $_CARGO_PARAMS

6
render-wasm/test
View file

@ -6,10 +6,10 @@ pushd $_SCRIPT_DIR;
. ./_build_env . ./_build_env
export SKIA_BINARIES_URL="https://github.com/penpot/skia-binaries/releases/download/0.81.0-3/skia-binaries-24dee32a277b6c7b5357-x86_64-unknown-linux-gnu-gl-svg-textlayout-binary-cache.tar.gz" export SKIA_BINARIES_URL=${SKIA_BINARIES_URL:-"https://github.com/penpot/skia-binaries/releases/download/0.81.0-3/skia-binaries-24dee32a277b6c7b5357-x86_64-unknown-linux-gnu-gl-svg-textlayout-binary-cache.tar.gz"}
export _CARGO_PARAMS="--target=x86_64-unknown-linux-gnu"; export CARGO_BUILD_TARGET=${CARGO_BUILD_TARGET:-"x86_64-unknown-linux-gnu"};
cargo test $_CARGO_PARAMS --bin render_wasm -- --show-output cargo test --bin render_wasm -- --show-output
# Exit with the same status code as cargo test # Exit with the same status code as cargo test
exit $? exit $?