Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add support for heroku-24 #1243

Merged
merged 6 commits into from
Apr 23, 2024
Merged

Add support for heroku-24 #1243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
91dcd87
Add heroku-24 to the test matrix
joshwlewis Apr 22, 2024
addece2
Run unit tests with explicit root user
joshwlewis Apr 22, 2024
35d877b
Run functional tests against heroku-24
joshwlewis Apr 22, 2024
6d03d61
Add changelog entry for heroku-24
joshwlewis Apr 22, 2024
4d47f10
Add --user root for makefile testing
joshwlewis Apr 23, 2024
25f051f
Use user owned dir instead of root user in makefile
joshwlewis Apr 23, 2024
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
8 changes: 5 additions & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,10 @@ jobs:
runs-on: ubuntu-22.04
container:
image: heroku/heroku:${{ matrix.stack_number }}-build
options: --user root
joshwlewis marked this conversation as resolved.
Show resolved Hide resolved
strategy:
matrix:
stack_number: ["20", "22"]
stack_number: ["20", "22", "24"]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Whilst approving/merging #1248 I noticed that the new Heroku-24 test jobs in the matrix weren't marked as required for branch protection (along with the "Test Metrics (14.10.0)" job too). I've added them to the required list now:
https://github.com/heroku/heroku-buildpack-nodejs/settings/branch_protection_rules/17110526

env:
STACK: heroku-${{ matrix.stack_number }}
steps:
Expand All @@ -29,9 +30,10 @@ jobs:
runs-on: ubuntu-22.04
container:
image: heroku/heroku:${{ matrix.stack_number }}-build
options: --user root
strategy:
matrix:
stack_number: ["20", "22"]
stack_number: ["20", "22", "24"]
env:
STACK: heroku-${{ matrix.stack_number }}
steps:
Expand Down Expand Up @@ -71,4 +73,4 @@ jobs:
- uses: actions/setup-node@v4
with:
node-version: ${{ matrix.version }}
- run: npx mocha metrics/test/metrics.spec.cjs
- run: npx mocha metrics/test/metrics.spec.cjs
3 changes: 2 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

## [Unreleased]

- Add support for heroku-24.

## [v243] - 2024-04-10

Expand All @@ -14,7 +15,7 @@
- Support [Corepack](https://nodejs.org/api/corepack.html) installation of [Yarn](https://yarnpkg.com/) ([#1222](https://github.com/heroku/heroku-buildpack-nodejs/pull/1222))

## [v241] - 2024-04-04

- Added Node.js version 21.7.2.
- Added Node.js version 20.12.1.
- Added Node.js version 18.20.1.
Expand Down
7 changes: 6 additions & 1 deletion makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ build-resolver-linux: .build
cargo install heroku-nodejs-utils --root .build --bin resolve_version --git https://github.com/heroku/buildpacks-nodejs --target x86_64-unknown-linux-musl --profile release
mv .build/bin/resolve_version lib/vendor/resolve-version-linux

test: heroku-22-build heroku-20-build
test: heroku-22-build heroku-20-build heroku-24-build

test-binary:
go test -v ./cmd/... -tags=integration
Expand All @@ -21,6 +21,11 @@ shellcheck:
@shellcheck -x ci-profile/**
@shellcheck -x etc/**

heroku-24-build:
@echo "Running tests in docker (heroku-24-build)..."
@docker run --platform "linux/amd64" -v $(shell pwd):/buildpack:ro --rm -it -e "STACK=heroku-24" heroku/heroku:24-build bash -c 'cp -r /buildpack ~/buildpack_test; cd ~/buildpack_test/; test/run;'
@echo ""

heroku-22-build:
@echo "Running tests in docker (heroku-22-build)..."
@docker run -v $(shell pwd):/buildpack:ro --rm -it -e "STACK=heroku-22" heroku/heroku:22-build bash -c 'cp -r /buildpack /buildpack_test; cd /buildpack_test/; test/run;'
Expand Down