Skip to content

Commit

Permalink
Use inventory file (#317)
Browse files Browse the repository at this point in the history
  • Loading branch information
Malax authored Feb 13, 2025
1 parent 0fad156 commit 758b89e
Show file tree
Hide file tree
Showing 5 changed files with 4,953 additions and 79 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,13 @@ jobs:
- run: make lint-ruby

hatchet:
name: "Hatchet (${{ matrix.stack }}, ${{ matrix.assets-base-url == 0 && 'production bucket' || 'staging bucket' }})"
name: "Hatchet (${{ matrix.stack }})"
runs-on: ubuntu-22.04
needs: lint
strategy:
fail-fast: false
matrix:
stack: ["heroku-20", "heroku-22", "heroku-24"]
assets-base-url: ["", "https://lang-jvm-staging2.s3.us-east-1.amazonaws.com/"]
env:
HATCHET_APP_LIMIT: 100
PARALLEL_SPLIT_TEST_PROCESSES: 8
Expand Down
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,13 @@

## [Unreleased]

### Changed

* New OpenJDK versions now always require a buildpack update. Previously, it was possible to install concrete OpenJDK versions (i.e. `11.0.25`, not `11`) without a buildpack update. The buildpack now utilizes an inventory file that explicitly lists the available versions, supported architectures, checksums and more. If you relied on an older buildpack version but manually updated your `system.properties` files for new OpenJDK versions, you will have to use the previous version (v158) of the buildpack. ([#317](https://github.com/heroku/heroku-buildpack-jvm-common/pull/317))

### Removed

* Support for deprecated `JDK_BASE_URL`. End users of the buildpack should not need to override the base URL for buildpack assets. In the unlikely case that you do require this feature, use `JVM_BUILDPACK_ASSETS_BASE_URL` to point the buildpack to an alternative base URL instead. ([#331](https://github.com/heroku/heroku-buildpack-jvm-common/pull/331))
* Support for deprecated `JDK_BASE_URL` and `JVM_BUILDPACK_ASSETS_BASE_URL`. These were used in the testing setup and were never intended to be used by users of this buildpack. Available assets are now recorded in an inventory file. ([#331](https://github.com/heroku/heroku-buildpack-jvm-common/pull/331), [#317](https://github.com/heroku/heroku-buildpack-jvm-common/pull/317))

## [v158] - 2025-02-03

Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ run:
@docker run --rm -v $(PWD):/src:ro --tmpfs /app -e "HOME=/app" -e "STACK=$(STACK)" "$(STACK_IMAGE_TAG)" \
bash -euo pipefail -c '\
mkdir /tmp/buildpack /tmp/build /tmp/cache /tmp/env; \
cp -r /src/{bin,lib,opt} /tmp/buildpack; \
cp -r /src/{bin,lib,opt,inventory.json} /tmp/buildpack; \
cp -rT /src/$(FIXTURE) /tmp/build; \
cd /tmp/buildpack; \
unset $$(printenv | cut -d '=' -f 1 | grep -vE "^(HOME|LANG|PATH|STACK)$$"); \
Expand Down
Loading

0 comments on commit 758b89e

Please sign in to comment.