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

Added missing changelog entries for npm buildpacks #697

Merged
merged 4 commits into from
Oct 24, 2023
Merged

Added missing changelog entries for npm buildpacks #697

merged 4 commits into from
Oct 24, 2023

Conversation

colincasey
Copy link
Contributor

The composite buildpack heroku/nodejs should have had entries added for the new npm buildpacks merged in PRs:

@colincasey
Added missing changelog entries for npm buildpacks
278942d 
The composite buildpack `heroku/nodejs` should have had entries added for the new npm buildpacks merged in PRs:
- #623
- #625
- #685
@colincasey colincasey self-assigned this Oct 24, 2023
@colincasey colincasey requested a review from a team as a code owner October 24, 2023 15:22
This was referenced Oct 24, 2023
Merged
Merged
Merged
@colincasey colincasey enabled auto-merge (squash) October 24, 2023 15:27
edmorley
edmorley reviewed Oct 24, 2023
View reviewed changes
Copy link
Member

@edmorley edmorley left a comment

Choose a reason for hiding this comment

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

I think this might mis-merge with the changes on main (I'm puzzled why the GitHub PR UI isn't showing this as "has conflicts") - maybe rebase before merging just in case? (Because of the ### Removed section added by #696)

meta-buildpacks/nodejs/CHANGELOG.md Outdated Show resolved Hide resolved
@joshwlewis @edmorley
Drop extra hyphen
34ea202 
Co-authored-by: Ed Morley <501702+edmorley@users.noreply.github.com>
@joshwlewis
Copy link
Member

@colincasey I disabled auto-merge, since it looks like there should have been a merge conflict in the ## Removed section. Maybe try rebasing this?

@colincasey
Merge branch 'main' into fix_changelog
a865544 
* main:
  Update Inventory for heroku/nodejs-yarn (#691)
  Remove `heroku/procfile` from `heroku/nodejs` (#696)
@colincasey
Added missing changelog entries for npm buildpacks
f126641 
The composite buildpack `heroku/nodejs` should have had entries added for the new npm buildpacks merged in PRs:
- #623
- #625
- #685
@colincasey
Copy link
Contributor Author

weird, the merge didn't complain about a conflict but duplicated the # Removed section twice

@colincasey colincasey enabled auto-merge (squash) October 24, 2023 15:46
@edmorley
Copy link
Member

CI has been running ~15 mins and some jobs haven't even started yet - due to waiting for instances of the pub-hk-ubuntu-22.04-large runner to be available. It might be the case that switching those jobs to the smaller default runner may end up being quicker (even with fewer CPUs/less memory), due to less wait time. (This could be offset by splitting the tests more and/or reducing the size of some of the test fixtures, so they install fewer packages etc).

@colincasey colincasey merged commit ee87816 into main Oct 24, 2023
21 checks passed
@colincasey colincasey deleted the fix_changelog branch October 24, 2023 15:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@edmorley edmorley edmorley approved these changes

@joshwlewis joshwlewis Awaiting requested review from joshwlewis

Assignees

@colincasey colincasey

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@colincasey @joshwlewis @edmorley