Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
129 changes: 0 additions & 129 deletions 0001-Revert-Merge-branch-dev-into-dev3.patch

This file was deleted.

2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM alpine:latest

COPY .cargo /root/.cargo

COPY 0001-Revert-Merge-branch-dev-into-dev3.patch build.sh mimalloc.diff /tmp
COPY build.sh mimalloc.diff /tmp

RUN /tmp/build.sh

Expand Down
4 changes: 1 addition & 3 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set -eu

MIMALLOC_VERSION=3.0.3
MIMALLOC_VERSION=3.1.4

cd /tmp

Expand All @@ -23,7 +23,6 @@ curl -f -L --retry 5 https://github.com/microsoft/mimalloc/archive/refs/tags/v$M

cd mimalloc-$MIMALLOC_VERSION

patch -p1 < /tmp/0001-Revert-Merge-branch-dev-into-dev3.patch
patch -p1 < /tmp/mimalloc.diff

cmake \
Expand Down Expand Up @@ -52,7 +51,6 @@ for libc_path in $(find /usr -name libc.a); do
done

rm -rf \
/tmp/0001-Revert-Merge-branch-dev-into-dev3.patch \
/tmp/build.sh \
/tmp/mimalloc.diff \
/tmp/mimalloc-$MIMALLOC_VERSION