Skip to content

Commit

Permalink
build with no jemalloc on windows
Browse files Browse the repository at this point in the history
  • Loading branch information
tzemanovic committed Jan 16, 2025
1 parent 7169a3f commit 9c50276
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 6 deletions.
6 changes: 5 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 4 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 1 addition & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"]}
Expand Down
9 changes: 9 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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 && \
Expand Down

0 comments on commit 9c50276

Please sign in to comment.