Skip to content

Commit

Permalink
heroku-22 via 5.3.0 build
Browse files Browse the repository at this point in the history
* default: 5.2.1 → 5.3.0
  • Loading branch information
hopkinschris committed Sep 19, 2024
1 parent e5e916b commit 2204b41
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 9 deletions.
16 changes: 11 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
default: heroku-18 heroku-20
default: heroku-18 heroku-20 heroku-22

VERSION := 5.2.1
VERSION := 5.3.0
ROOT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))

clean:
Expand All @@ -11,12 +11,13 @@ src/jemalloc-%.tar.bz2:
mkdir -p $$(dirname $@)
curl -fsL https://github.com/jemalloc/jemalloc/releases/download/$*/jemalloc-$*.tar.bz2 -o $@

.PHONY: heroku-18 heroku-20 docker\:pull
.PHONY: heroku-18 heroku-20 heroku-22 docker\:pull

# Updates the docker image to ensure we're building with the latest environment.
docker\:pull:
docker pull heroku/heroku:18-build
docker pull heroku/heroku:20-build
docker pull heroku/heroku:22-build

# Build for heroku-18 stack
heroku-18: src/jemalloc-$(VERSION).tar.bz2 docker\:pull
Expand All @@ -28,7 +29,12 @@ heroku-20: src/jemalloc-$(VERSION).tar.bz2 docker\:pull
docker run --rm -it --volume="$(ROOT_DIR):/wrk" \
heroku/heroku:20-build /wrk/build.sh $(VERSION) heroku-20

# Build for heroku-22 stack
heroku-22: src/jemalloc-$(VERSION).tar.bz2 docker\:pull
docker run --rm -it --volume="$(ROOT_DIR):/wrk" \
heroku/heroku:22-build /wrk/build.sh $(VERSION) heroku-22

# Build recent releases for all supported stacks
all:
$(MAKE) heroku-18 heroku-20 VERSION=5.2.1
$(MAKE) heroku-18 heroku-20 VERSION=5.3.0
$(MAKE) heroku-18 heroku-20 heroku-22 VERSION=5.2.1
$(MAKE) heroku-18 heroku-20 heroku-22 VERSION=5.3.0
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,13 @@ Set this to select or pin to a specific version of jemalloc. The default is to
use the latest stable version if this is not set. You will receive an error
mentioning tar if the version does not exist.

**Default**: `5.2.1`
**Default**: `5.3.0`

**note:** This setting is only used during slug compilation. Changing it will
require a code change to be deployed in order to take affect.

```bash
heroku config:set JEMALLOC_VERSION=5.2.1
heroku config:set JEMALLOC_VERSION=5.3.0
```

#### Available Versions
Expand All @@ -84,7 +84,7 @@ This uses Docker to build against Heroku
[stack-image](https://github.com/heroku/stack-images)-like images.

```bash
make VERSION=5.2.1
make VERSION=5.3.0
```

Artifacts will be dropped in `dist/` based on Heroku stack and jemalloc version.
Expand Down
2 changes: 1 addition & 1 deletion bin/compile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ CACHE_DIR=$2
ENV_DIR=$3

# Default version
version="5.2.1"
version="5.3.0"

# Read version from configured JEMALLOC_VERSION
if [ -f $ENV_DIR/JEMALLOC_VERSION ]; then
Expand Down

0 comments on commit 2204b41

Please sign in to comment.