Skip to content

Commit

Permalink
Merge branch 'main' into npm-buildpacks/nodejs-npm-engine
Browse files Browse the repository at this point in the history
* main:
  Update Inventory for heroku/nodejs-engine (#681)
  Update Inventory for heroku/nodejs-npm-engine (#678)
  Bump the rust-dependencies group with 2 updates (#680)
  Group minor/patch version Rust Dependabot updates into one PR (#679)

# Conflicts:
#	Cargo.lock
#	buildpacks/nodejs-npm-engine/CHANGELOG.md
  • Loading branch information
colincasey committed Oct 11, 2023
2 parents fd61c9f + 56d18ef commit 50ac635
Show file tree
Hide file tree
Showing 6 changed files with 47 additions and 29 deletions.
17 changes: 13 additions & 4 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,28 @@
version: 2
updates:
- package-ecosystem: "bundler"
directory: "/"
schedule:
interval: "monthly"
- package-ecosystem: "cargo"
directory: "/"
schedule:
interval: "monthly"
labels:
- "dependencies"
- "rust"
- "skip changelog"
groups:
# Note: The group order matters, since updates are assigned to the first matching group.
libcnb:
patterns:
- "libcnb*"
- "libherokubuildpack"
rust-dependencies:
update-types:
- "minor"
- "patch"
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "monthly"
labels:
- "dependencies"
- "github actions"
- "skip changelog"
9 changes: 2 additions & 7 deletions .github/workflows/check_changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,15 @@ name: Check Changelog

on:
pull_request:
types: [opened, reopened, edited, labeled, unlabeled, synchronize]
types: [opened, reopened, labeled, unlabeled, synchronize]

permissions:
contents: read

jobs:
check-changelog:
runs-on: ubuntu-latest
if: |
!contains(github.event.pull_request.body, '[skip changelog]') &&
!contains(github.event.pull_request.body, '[changelog skip]') &&
!contains(github.event.pull_request.body, '[skip ci]') &&
!contains(github.event.pull_request.labels.*.name, 'skip changelog') &&
!contains(github.event.pull_request.labels.*.name, 'dependencies')
if: (!contains(github.event.pull_request.labels.*.name, 'skip changelog'))
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down
36 changes: 18 additions & 18 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions buildpacks/nodejs-engine/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

- Added Node.js version 18.18.1.
- Added Node.js version 20.8.0.
- Provides `npm` added to the build plan since a default version of `npm` is bundled with Node.js. ([#622](https://github.com/heroku/buildpacks-nodejs/pull/622))

Expand Down
7 changes: 7 additions & 0 deletions buildpacks/nodejs-engine/inventory.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5404,6 +5404,13 @@ arch = "linux-x64"
url = "https://heroku-nodebin.s3.us-east-1.amazonaws.com/node/release/linux-x64/node-v18.18.0-linux-x64.tar.gz"
etag = "6786cf20445987a3db61fe4d032d1f56-6"

[[releases]]
version = "18.18.1"
channel = "release"
arch = "linux-x64"
url = "https://heroku-nodebin.s3.us-east-1.amazonaws.com/node/release/linux-x64/node-v18.18.1-linux-x64.tar.gz"
etag = "42f1a933e23073a3c891a724e131436c-6"

[[releases]]
version = "18.2.0"
channel = "release"
Expand Down
6 changes: 6 additions & 0 deletions buildpacks/nodejs-npm-engine/inventory.toml
Original file line number Diff line number Diff line change
Expand Up @@ -426,3 +426,9 @@ channel = "release"
url = "https://heroku-nodebin.s3.us-east-1.amazonaws.com/npm/release/npm-v9.8.1.tar.gz"
etag = "a54b82af3b9133e8d9a4825ee04bbbb1"

[[releases]]
version = "9.9.0"
channel = "release"
url = "https://heroku-nodebin.s3.us-east-1.amazonaws.com/npm/release/npm-v9.9.0.tar.gz"
etag = "7abb5e63930fba210e2567f2d61a04c6"

0 comments on commit 50ac635

Please sign in to comment.