From 4d64c2b939d4bb1074b5ae5631cf2616368f78d8 Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Fri, 3 Sep 2021 13:57:45 -0700 Subject: [PATCH] Put emscripten-version file in cli directory This lets the CLI crate build without relying on sibling directories. --- .github/workflows/ci.yml | 2 +- cli/build.rs | 2 +- emscripten-version => cli/emscripten-version | 0 script/build-wasm | 2 +- script/fetch-emscripten | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) rename emscripten-version => cli/emscripten-version (100%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f5435945..bfcd9f8c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -36,7 +36,7 @@ jobs: - name: Read Emscripten version run: | - printf 'EMSCRIPTEN_VERSION=%s\n' "$(cat emscripten-version)" >> $GITHUB_ENV + printf 'EMSCRIPTEN_VERSION=%s\n' "$(cat cli/emscripten-version)" >> $GITHUB_ENV - name: Cache artifacts id: cache diff --git a/cli/build.rs b/cli/build.rs index e8a1320b..1986e023 100644 --- a/cli/build.rs +++ b/cli/build.rs @@ -16,7 +16,7 @@ fn main() { "RUST_BINDING_VERSION", rust_binding_version, ); - let emscripten_version = fs::read_to_string("../emscripten-version").unwrap(); + let emscripten_version = fs::read_to_string("emscripten-version").unwrap(); println!( "cargo:rustc-env={}={}", "EMSCRIPTEN_VERSION", emscripten_version, diff --git a/emscripten-version b/cli/emscripten-version similarity index 100% rename from emscripten-version rename to cli/emscripten-version diff --git a/script/build-wasm b/script/build-wasm index 201d0b50..19c7aa13 100755 --- a/script/build-wasm +++ b/script/build-wasm @@ -33,7 +33,7 @@ web_dir=lib/binding_web emscripten_flags="-O3" minify_js=1 force_docker=0 -emscripen_version=$(cat "$(dirname "$0")"/../emscripten-version) +emscripen_version=$(cat "$(dirname "$0")"/../cli/emscripten-version) while [[ $# > 0 ]]; do case "$1" in diff --git a/script/fetch-emscripten b/script/fetch-emscripten index 157d0cae..4b579df0 100755 --- a/script/fetch-emscripten +++ b/script/fetch-emscripten @@ -2,7 +2,7 @@ set -e -EMSCRIPTEN_VERSION=$(cat "$(dirname "$0")/../emscripten-version") +EMSCRIPTEN_VERSION=$(cat "$(dirname "$0")/../cli/emscripten-version") mkdir -p target EMSDK_DIR="./target/emsdk"