Skip to content

Commit

Permalink
re-add jemalloc submodule
Browse files Browse the repository at this point in the history
  • Loading branch information
gnzlbg committed May 3, 2018
1 parent 0390383 commit 1babc4e
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 6 deletions.
3 changes: 2 additions & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
[submodule "jemalloc-sys/jemalloc"]
path = jemalloc-sys/jemalloc
url = https://github.com/rust-lang/jemalloc
url = https://github.com/jemalloc/jemalloc
branch = dev
6 changes: 2 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,11 @@ matrix:
# - env: TARGET=asmjs-unknown-emscripten
# - env: TARGET=wasm32-unknown-emscripten

script: ci/run.sh
script:
- ci/run.sh
env:
global:
- secure: "2Z1z4ir++XEQb9eegYTMolsNfTo1aATric2k4KfvRgnG1nAvvccf1Jg0828PVeqqD6w5f+X52AVT4bTDXbSL5L+/cTiBuVmY3943nyNOgHxFBTbVlnLtGnh18bb7AQAhyH1L9KjiLptMtFUfIg3TQ9r0QS+cBEJMFiE8BuuQMq/uPZYF3QMuV8W+9AwnqZPgdZV4q7LRnx2gHyVKifRfa4v0TxJA+fY5euON8CKemw12yVTZyNS5WUq6GLvQa5KsSYOSAIYizxz8Mze8plQytc6VhF3OuFyJ72u5LAx+szyxIu8zNAkyNeUqI1/V1gnlhWbZfov6KV56qoV9U8+xKp1J/nCXdabHEO/saOgWk4XgSSc7JNsT1PMPKT18r7JwNha0DS2onWBbegYMV0YXyH/WVAM+oXvhZAj7WPz5bHRbgkatGmBZD2jOjRQxzSugJsZzsmrKbWm8lIoyJGdNxTn5CisYElZvP1CV1OFaQBkaLfmnlpbJ0NQXpQdnpgXuLvI7sXptyn0Bjt41JQclB2BU98SrEiR0hPlkh8m4fH/QpQ8WdXEtvKXTX8UtG5RPW0UvTZVZtrU4Weyu2Hctj2D/hkXywtBXp7mUhB21fBGiaEc+vh6Q2OrZPrwoAj3YWfLlNBjFmfKmUwXXLno4FLLUujFmmypgs4Qit5HtzwQ="
notifications:
email:
on_success: never

git:
submodules: false
11 changes: 10 additions & 1 deletion ci/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,16 @@ export CARGO_CMD=cross
# Runs jemalloc tests using "make check":
#export JEMALLOC_SYS_RUN_TESTS=1

# FIXME when jemalloc 5.1 is released, should just be:
# git submodule init --update --recursive
# This fetches the jemalloc 5.1rc1 commit manually
cd jemalloc-sys
rm -rf jemalloc
git clone https://github.com/jemalloc/jemalloc.git
cd jemalloc
git checkout -b rc1 b8f4c730eff28edee4b583ff5b6ee1fac0f26c27
cd ../..

# Use cargo on native CI platforms:
if [[ ${TARGET} = *"windows"* ]] || \
[[ ${TARGET} = *"x86_64-unknown-linux-gnu"* ]] || [[ ${TARGET} = *"i686-unknown-linux-gnu"* ]] || [[ ${TARGET} = *"i586-unknown-linux-gnu"* ]] \
Expand All @@ -21,7 +31,6 @@ if [[ ${TARGET} = *"windows"* ]] || \
export JEMALLOC_SYS_VERIFY_CONFIGURE=1
else
cargo install cross
docker build -t jemallocator/${TARGET}:0.1 ci/docker/${TARGET}
fi

# Make sure TARGET is installed when using cargo:
Expand Down
1 change: 1 addition & 0 deletions jemalloc-sys/jemalloc
Submodule jemalloc added at b8f4c7

0 comments on commit 1babc4e

Please sign in to comment.