chore: merge main, fix conflicts

prisma · Dec 4, 2023 · f169fe7 · f169fe7
2 parents 7370d1f + 845c140
commit f169fe7
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/query-engine/query-engine-wasm/build.sh b/query-engine/query-engine-wasm/build.sh
@@ -15,10 +15,10 @@ OUT_NPM_NAME="@prisma/query-engine-wasm"
 sed -i '' 's/name = "query_engine_wasm"/name = "query_engine"/g' Cargo.toml
 
 # use `wasm-pack build --release` on CI only
-if [[ -z "$BUILDKITE" ]] || [[ -z "$GITHUB_ACTIONS" ]]; then
-    BUILD_PROFILE="--release"
-else
+if [[ -z "$BUILDKITE" ]] && [[ -z "$GITHUB_ACTIONS" ]]; then
     BUILD_PROFILE="--dev"
+else
+    BUILD_PROFILE="--release"
 fi
 
 # Check if wasm-pack is installed
@@ -28,6 +28,7 @@ then
     # Install wasm-pack
     curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
 fi
+
 wasm-pack build $BUILD_PROFILE --target $OUT_TARGET
 
 sed -i '' 's/name = "query_engine"/name = "query_engine_wasm"/g' Cargo.toml