From 9c50276766f91944726200c01e2f48403f98b126 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Zemanovi=C4=8D?= <tomas@heliax.dev>
Date: Thu, 16 Jan 2025 15:02:06 +0000
Subject: [PATCH] build with no jemalloc on windows

---
 .github/workflows/release.yml | 6 +++++-
 Cargo.lock                    | 6 ++++--
 Cargo.toml                    | 4 +---
 Makefile                      | 9 +++++++++
 4 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index a2f9d5e033..46abcc6d9a 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -83,8 +83,12 @@ jobs:
         with:
           name: wasm-${{ github.sha }}
           path: wasm
-      - name: Build release package for ${{ matrix.os }}
+      - name: Build release package for ${{ matrix.os }} (non-Windows)
+        if: ${{ !startsWith(runner.os, 'Windows') }}
         run: make package
+      - name: Build release package for ${{ matrix.os }} (Windows)
+        if: ${{ startsWith(runner.os, 'Windows') }}
+        run: make package-no-jemalloc
       - name: Upload binaries package
         uses: actions/upload-artifact@v4
         with:
diff --git a/Cargo.lock b/Cargo.lock
index fd21a50996..fc7e7c2b72 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4375,7 +4375,8 @@ dependencies = [
 [[package]]
 name = "librocksdb-sys"
 version = "0.16.0+8.10.0"
-source = "git+https://github.com/heliaxdev/rust-rocksdb?rev=4dc7f4fdfa17e923d3078d51261e3db66707754d#4dc7f4fdfa17e923d3078d51261e3db66707754d"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce3d60bc059831dc1c83903fb45c103f75db65c5a7bf22272764d9cc683e348c"
 dependencies = [
  "bindgen",
  "bzip2-sys",
@@ -7225,7 +7226,8 @@ dependencies = [
 [[package]]
 name = "rocksdb"
 version = "0.22.0"
-source = "git+https://github.com/heliaxdev/rust-rocksdb?rev=4dc7f4fdfa17e923d3078d51261e3db66707754d#4dc7f4fdfa17e923d3078d51261e3db66707754d"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6bd13e55d6d7b8cd0ea569161127567cd587676c99f4472f779a0279aa60a7a7"
 dependencies = [
  "libc",
  "librocksdb-sys",
diff --git a/Cargo.toml b/Cargo.toml
index e8f5805ff4..694fe87bab 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -167,9 +167,7 @@ regex = "1.10.2"
 reqwest = "0.11.4"
 ripemd = "0.1"
 rlimit = "0.5.4"
-# rocksdb = {version = "0.22.0", features = ['zstd'], default-features = false}
-# TEMP branch "tomas/no-jemalloc-win", replace once upstreamed
-rocksdb = {git = "https://github.com/heliaxdev/rust-rocksdb", rev = "4dc7f4fdfa17e923d3078d51261e3db66707754d", features = ['zstd'], default-features = false}
+rocksdb = {version = "0.22.0", features = ['zstd'], default-features = false}
 rpassword = "5.0.1"
 rustversion = "1.0"
 serde = {version = "1.0.125", features = ["derive"]}
diff --git a/Makefile b/Makefile
index cce9cbcb72..d60ed13a0d 100644
--- a/Makefile
+++ b/Makefile
@@ -83,6 +83,12 @@ build-release:
 		--features jemalloc \
 		--features migrations
 
+build-release-no-jemalloc:
+	$(cargo) build $(jobs) --release --timings --package namada_apps \
+		--manifest-path Cargo.toml \
+		--no-default-features \
+		--features migrations
+
 build-debug:
 	$(cargo) build --package namada_apps --manifest-path Cargo.toml
 
@@ -95,6 +101,9 @@ check-release:
 package: build-release
 	scripts/make-package.sh
 
+package-no-jemalloc: build-release-no-jemalloc
+	scripts/make-package.sh
+
 check-wasm = $(cargo) check --target wasm32-unknown-unknown --manifest-path $(wasm)/Cargo.toml
 check:
 	$(cargo) check --workspace && \