Merge branch 'heroku:main' into master

Author: mike-lang

.github/CODEOWNERS

@@ -1 +1,16 @@
+# Default to requesting pull request reviews from the Heroku Languages team.
+#ECCN:Open Source
+#GUSINFO:Languages,Heroku Node.js Platform
 * @heroku/languages
+
+# However, request review from the language owner instead for files that are updated
+# by Dependabot or inventory/release automation, to reduce team review request noise.
+CHANGELOG.md @colincasey
+Gemfile.lock @colincasey
+inventory/ @colincasey
+npm-shrinkwrap.json @colincasey
+package.json @colincasey
+package-lock.json @colincasey
+pnpm-lock.yaml @colincasey
+yarn.lock @colincasey
+/.github/workflows/ @colincasey

.github/ISSUE_TEMPLATE/bug_report.md

@@ -20,7 +20,7 @@ Steps to reproduce the behavior:
 4. See error
 
 **Versions (please complete the following information):**
- - Heroku Stack: [e.g. `heroku-20`]
+ - Heroku Stack: [e.g. `heroku-22`]
  - Node Version: [e.g. `15.0.0`]
  - NPM or Yarn Version: [e.g. `Yarn 1.22.10`]
  - Buildpack Version: [e.g. `heroku/nodejs v175`] (We will try to do our best to support you, but please note that we can only provide support for the latest release of the buildpack.)

.github/dependabot.yml

@@ -21,3 +21,8 @@ updates:
       - "dependencies"
       - "github actions"
       - "skip changelog"
+    groups:
+      github-actions:
+        update-types:
+          - "minor"
+          - "patch"

.github/workflows/check_changelog.yml

@@ -9,7 +9,7 @@ permissions:
 
 jobs:
   check-changelog:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     if: (!contains(github.event.pull_request.labels.*.name, 'skip changelog'))
     steps:
       - name: Checkout

.github/workflows/ci.yml

@@ -11,12 +11,13 @@ permissions:
 jobs:
 
   unit-test:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     container:
       image: heroku/heroku:${{ matrix.stack_number }}-build
+      options: --user root
     strategy:
       matrix:
-        stack_number: ["20", "22"]
+        stack_number: ["22", "24"]
     env:
       STACK: heroku-${{ matrix.stack_number }}
     steps:
@@ -26,12 +27,13 @@ jobs:
         run: test/unit
 
   functional-test:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     container:
       image: heroku/heroku:${{ matrix.stack_number }}-build
+      options: --user root
     strategy:
       matrix:
-        stack_number: ["20", "22"]
+        stack_number: ["22", "24"]
     env:
       STACK: heroku-${{ matrix.stack_number }}
     steps:
@@ -41,7 +43,7 @@ jobs:
         run: test/run
 
   hatchet-test:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     env:
       HEROKU_API_KEY: ${{ secrets.HEROKU_API_KEY }}
       HEROKU_API_USER: ${{ secrets.HEROKU_API_USER }}
@@ -52,7 +54,23 @@ jobs:
       - name: Install Ruby and gems
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '2.7'
+          ruby-version: 3.1
           bundler-cache: true
       - name: Run hatchet tests
         run: make hatchet
+
+  metrics-test:
+    strategy:
+      fail-fast: false
+      matrix:
+        # check the minimum node version supported by the metrics script and the latest node version
+        # (assumes the versions between have backwards-compatible APIs)
+        version: [14.10.0, latest]
+    name: Test Metrics (${{ matrix.version }})
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: ${{ matrix.version }}
+      - run: npx mocha@10.x metrics/test/metrics.spec.cjs

.github/workflows/hatchet_app_cleaner.yml

@@ -1,4 +1,4 @@
-name: Hatchet app cleaner
+name: Hatchet App Cleaner
 
 on:
   schedule:
@@ -12,7 +12,7 @@ permissions:
 
 jobs:
   hatchet-app-cleaner:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     env:
       HEROKU_API_KEY: ${{ secrets.HEROKU_API_KEY }}
       HEROKU_API_USER: ${{ secrets.HEROKU_API_USER }}
@@ -24,7 +24,7 @@ jobs:
         uses: ruby/setup-ruby@v1
         with:
           bundler-cache: true
-          ruby-version: "2.7"
+          ruby-version: 3.1
       - name: Run Hatchet destroy
         # Only apps older than 10 minutes are destroyed, to ensure that any
         # in progress CI runs are not interrupted.

.github/workflows/inventory.yml

@@ -7,95 +7,41 @@ on:
 jobs:
   update-nodejs-inventory:
     name: Update Node.js Engine Inventory
-    runs-on: pub-hk-ubuntu-22.04-small
+    runs-on: pub-hk-ubuntu-24.04-ip
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v4
-      - name: Install Rust Toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
+      - name: Update Rust toolchain
+        run: rustup update
       - name: Install Rust Inventory Binaries
-        run: cargo install heroku-nodejs-utils --bin diff_versions --bin generate_inventory --git https://github.com/heroku/buildpacks-nodejs
-      - id: set-diff-msg
-        name: Set Diff Message
+        run: cargo install heroku-nodejs-utils --bin update_node_inventory --git https://github.com/heroku/buildpacks-nodejs
+      - name: Rebuild Inventory
+        id: rebuild-inventory
         run: |
           delimiter="$(openssl rand -hex 8)"
           {
             echo "msg<<${delimiter}"
-            diff_versions node inventory/node.toml
+            update_node_inventory ./inventory/node.toml ./CHANGELOG.md --platform linux-x64 --format classic
             echo "${delimiter}"
           } >> $GITHUB_OUTPUT
-      - name: Rebuild Inventory
-        run: "generate_inventory node > inventory/node.toml"
-      - name: Update Changelog
-        run: echo "${{ steps.set-diff-msg.outputs.msg }}" | xargs -r -I '{}' perl -i -p -e 's/## main\s+/## main\n\n{}/' CHANGELOG.md
-      - uses: heroku/use-app-token-action@main
+      - uses: actions/create-github-app-token@v2
         id: generate-token
         with:
-          app_id: ${{ vars.LINGUIST_GH_APP_ID }}
-          private_key: ${{ secrets.LINGUIST_GH_PRIVATE_KEY }}
+          app-id: ${{ vars.LINGUIST_GH_APP_ID }}
+          private-key: ${{ secrets.LINGUIST_GH_PRIVATE_KEY }}
       - name: Create Pull Request
         id: pr
-        uses: peter-evans/create-pull-request@v5.0.2
+        uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v7.0.8
         with:
-          token: ${{ steps.generate-token.outputs.app_token }}
+          token: ${{ steps.generate-token.outputs.token }}
           title: "Update Node.js Engine Inventory"
-          commit-message: "Update Inventory for heroku/nodejs engine\n\n${{ steps.set-diff-msg.outputs.msg }}"
+          commit-message: "Update Inventory for heroku/nodejs-engine\n\n${{ steps.rebuild-inventory.outputs.msg }}"
           branch: update-nodejs-inventory
-          body: "Automated pull-request to update heroku/nodejs engine inventory:\n\n${{ steps.set-diff-msg.outputs.msg }}"
-          committer: ${{ vars.LINGUIST_GH_APP_USERNAME }} <${{ vars.LINGUIST_GH_APP_EMAIL }}>
-          author: ${{ vars.LINGUIST_GH_APP_USERNAME }} <${{ vars.LINGUIST_GH_APP_EMAIL }}>
-      - name: Configure PR
-        if: steps.pr.outputs.pull-request-operation == 'created'
-        run: gh pr merge --squash --auto "${{ steps.pr.outputs.pull-request-number }}"
-        env:
-          GH_TOKEN: ${{ steps.generate-token.outputs.app_token }}
-          
-  update-yarn-inventory:
-    name: Update Node.js Yarn Inventory
-    runs-on: pub-hk-ubuntu-22.04-small
-    steps:
-      - name: Checkout Repo
-        uses: actions/checkout@v4
-      - id: install-rust-toolchain
-        name: Install Rust Toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-      - name: Install Rust Inventory Binaries
-        run: cargo install heroku-nodejs-utils --bin diff_versions --bin generate_inventory --git https://github.com/heroku/buildpacks-nodejs
-      - id: set-diff-msg
-        name: Set Diff Message
-        run: |
-          delimiter="$(openssl rand -hex 8)"
-          {
-            echo "msg<<${delimiter}"
-            diff_versions yarn inventory/yarn.toml
-            echo "${delimiter}"
-          } >> $GITHUB_OUTPUT
-      - name: Rebuild Inventory
-        run: "generate_inventory yarn > inventory/yarn.toml"
-      - name: Update Changelog
-        run: echo "${{ steps.set-diff-msg.outputs.msg }}" | xargs -r -I '{}' perl -i -p -e 's/## main\s+/## main\n\n{}/' CHANGELOG.md
-      - uses: heroku/use-app-token-action@main
-        id: generate-token
-        with:
-          app_id: ${{ vars.LINGUIST_GH_APP_ID }}
-          private_key: ${{ secrets.LINGUIST_GH_PRIVATE_KEY }}
-      - name: Create Pull Request
-        id: pr
-        uses: peter-evans/create-pull-request@v5.0.2
-        with:
-          token: ${{ steps.generate-token.outputs.app_token }}
-          title: "Update Node.js Yarn Inventory"
-          commit-message: "Update Inventory for heroku/nodejs yarn\n\n${{ steps.set-diff-msg.outputs.msg }}"
-          branch: update-yarn-inventory
-          body: "Automated pull-request to update heroku/nodejs yarn inventory:\n\n${{ steps.set-diff-msg.outputs.msg }}"
+          body: "Automated pull-request to update heroku/nodejs-engine inventory:\n\n${{ steps.rebuild-inventory.outputs.msg }}"
           committer: ${{ vars.LINGUIST_GH_APP_USERNAME }} <${{ vars.LINGUIST_GH_APP_EMAIL }}>
           author: ${{ vars.LINGUIST_GH_APP_USERNAME }} <${{ vars.LINGUIST_GH_APP_EMAIL }}>
       - name: Configure PR
         if: steps.pr.outputs.pull-request-operation == 'created'
         run: gh pr merge --squash --auto "${{ steps.pr.outputs.pull-request-number }}"
         env:
-          GH_TOKEN: ${{ steps.generate-token.outputs.app_token }}
+          GH_TOKEN: ${{ steps.generate-token.outputs.token }}

.github/workflows/prepare_release.yml

@@ -0,0 +1,9 @@
+name: Prepare Release
+
+on:
+  workflow_dispatch:
+
+jobs:
+  prepare-release:
+    uses: heroku/languages-github-actions/.github/workflows/_classic-buildpack-prepare-release.yml@latest
+    secrets: inherit