Merge remote-tracking branch 'upstream/main'

* upstream/main: (79 commits)
  Delete CNB release workflow (heroku#1303)
  v240 (heroku#1298)
  Upgrade Bundler 2.x to v2.3.10 (heroku#1296)
  Bump parallel_tests from 3.7.3 to 3.8.1 (heroku#1292)
  Bump actions/checkout from 2.4.0 to 3 (heroku#1283)
  Bump excon from 0.91.0 to 0.92.1 (heroku#1286)
  Bump peter-evans/create-pull-request from 3 to 4 (heroku#1291)
  Split bootstrap version from default version (heroku#1289)
  Rollback bundler change (heroku#1281)
  Upgrade bundler to 2.3.7 (heroku#1276)
  v237 (heroku#1277)
  Update default Ruby version to 3.0.3 (heroku#1270)
  Bump buildpacks/github-actions from 4.5.1 to 4.6.0 (heroku#1275)
  Bump rspec-expectations from 3.10.2 to 3.11.0 (heroku#1272)
  Bump excon from 0.90.0 to 0.91.0 (heroku#1269)
  Bump redis from 4.5.1 to 4.6.0 (heroku#1268)
  Bump toml-rb from 2.1.1 to 2.1.2 (heroku#1266)
  Bump ci-queue from 0.22.0 to 0.22.1 (heroku#1265)
  Bump rspec-core from 3.10.1 to 3.10.2 (heroku#1264)
  Bump buildpacks/github-actions from 4.5.0 to 4.5.1 (heroku#1263)
  ...

.circleci/config.yml

@@ -1,26 +1,65 @@
 version: 2.1
 orbs:
-  buildpacks: jkutner/buildpacks@0.1.0
-  ruby: circleci/ruby@0.2.1
+  pack: buildpacks/pack@0.2.4
+
 jobs:
   build:
-    machine: true
+    machine:
+      image: ubuntu-2004:202201-02
     steps:
-      - buildpacks/install-pack:
-          version: "0.11.0"
       - checkout
+      - pack/install-pack:
+          version: 0.24.0
+      - restore_cache:
+          keys:
+            - v3-ruby-3.1.1
+
       - run:
+          name: Install ruby-install
           command: |
-            rvm install 2.6.6
-            rvm use ruby-2.6.6
-            export PATH="/opt/circleci/.rvm/rubies/ruby-2.6.6/bin:$PATH"
-            export GEM_HOME="/opt/circleci/.rvm/gems/ruby-2.6.6"
-            export GEM_PATH="/opt/circleci/.rvm/gems/ruby-2.6.6"
-            gem install bundler -v 2.1.0
+              wget -O ruby-install-0.8.3.tar.gz https://github.com/postmodern/ruby-install/archive/v0.8.3.tar.gz
+              tar -xzvf ruby-install-0.8.3.tar.gz
+              cd ruby-install-0.8.3/
+              sudo make install
+      - run:
+          name: Install chruby
+          command: |
+              wget -O chruby-0.3.9.tar.gz https://github.com/postmodern/chruby/archive/v0.3.9.tar.gz
+              tar -xzvf chruby-0.3.9.tar.gz
+              cd chruby-0.3.9/
+              sudo make install
+
+      - run:
+          name: Ruby install
+          command: |
+              ruby-install ruby 3.1.1 --no-reinstall
+
+      - run:
+          name: Set chruby defaults
+          command: |
+            echo 'source /usr/local/share/chruby/chruby.sh' >> $BASH_ENV
+            echo 'chruby ruby-3.1.1' >> $BASH_ENV
+
+      - save_cache:
+          key: v3-ruby-3.1.1
+          paths:
+            - "~/.rubies"
+
+      - run:
+          command: |
+            rvm implode --force
+            chruby 3.1.1
+
+            gem install bundler -v 2.2.32 --no-document
+            bundle config deployment 'true'
+            bundle config path ./vendor/bundle
             bundle install
+            bundle clean
+
             bundle exec rake hatchet:setup_ci
             echo "pack version: $(pack --version)"
-            rspec spec/cnb/
+
+            bundle exec rspec spec/cnb/
 
 workflows:
   main:

.github/CODEOWNERS

@@ -1 +1,2 @@
 * @heroku/languages
+#ECCN:Open Source

.github/dependabot.yml

@@ -2,8 +2,10 @@ version: 2
 updates:
   - package-ecosystem: "bundler"
     directory: "/"
-    open-pull-requests-limit: 1 # Limit concurrent CI runs from executing
+    open-pull-requests-limit: 1 # Limit concurrent CI runs from executing, do not remove
+    schedule:
+      interval: "weekly"
+  - package-ecosystem: "github-actions"
+    directory: "/"
     schedule:
       interval: "weekly"
-    labels:
-      - "dependencies"

.github/workflows/check_changelog.yml

@@ -1,16 +1,22 @@
 name: Check Changelog
 
 on:
- pull_request:
-  types: [opened, reopened, edited, synchronize]
+  pull_request:
+    types: [opened, reopened, edited, labeled, unlabeled, synchronize]
+
 jobs:
-  build:
+  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') &&
       !contains(github.event.pull_request.labels.*.name, 'automation')
-    runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v1
-    - name: Check that CHANGELOG is touched
-      run: |
-        cat $GITHUB_EVENT_PATH | jq .pull_request.title |  grep -i '\[\(\(changelog skip\)\|\(ci skip\)\)\]' ||  git diff remotes/origin/${{ github.base_ref }} --name-only | grep CHANGELOG.md
+      - uses: actions/checkout@v3
+      - name: Check that CHANGELOG is touched
+        run: |
+          git fetch origin ${{ github.base_ref }} --depth 1 && \
+          git diff remotes/origin/${{ github.base_ref }} --name-only | grep CHANGELOG.md

.gitignore

@@ -8,3 +8,4 @@ buildpacks/*
 .anvil/
 tmp/*.log
 log/*.log
+spec/examples.txt

.rspec

@@ -0,0 +1 @@
+--require dead_end

CHANGELOG.md

@@ -1,4 +1,63 @@
-# Main (unreleased)
+# Changelog
+
+## Main (unreleased)
+
+## v240 (2022/04/05)
+
+* Add support for heroku-22 (https://github.com/heroku/heroku-buildpack-ruby/pull/1289)
+* Bundler 2.x is now 2.3.10 (https://github.com/heroku/heroku-buildpack-ruby/pull/1296)
+
+## v239 (2022/03/02)
+
+* Rollback bundler 2.x change. Bundler 2.x is now back at 2.2.33 (https://github.com/heroku/heroku-buildpack-ruby/pull/1281)
+
+## v238 (2022/03/02)
+
+* Bundler 2.x is now 2.3.7 (https://github.com/heroku/heroku-buildpack-ruby/pull/1276)
+
+## v237 (2022/02/24)
+
+* Default Ruby version is now 3.0.3 (https://github.com/heroku/heroku-buildpack-ruby/pull/1270)
+
+## v236 (2022/01/04)
+
+* Fix deprecated rake tasks for Rails 7 on Heroku CI (https://github.com/heroku/heroku-buildpack-ruby/pull/1257)
+
+## v235 (2022/01/03)
+
+* Bundler 2.x is now 2.2.33 (https://github.com/heroku/heroku-buildpack-ruby/pull/1248)
+
+## v234 (12/16/2021)
+
+* Fix YML indentation from v233 (https://github.com/heroku/heroku-buildpack-ruby/pull/1252)
+
+## v233 (12/16/2021)
+
+* Default node version now 16.13.1, yarn is 1.22.17 (https://github.com/heroku/heroku-buildpack-ruby/pull/1238)
+* Default Ruby version is now 2.7.5 (https://github.com/heroku/heroku-buildpack-ruby/pull/1237)
+* Remove instrumentation and LPXC logic (https://github.com/heroku/heroku-buildpack-ruby/pull/1229)
+
+## v232 (11/9/2021)
+
+* Deactivate LPXC (https://github.com/heroku/heroku-buildpack-ruby/pull/1228)
+
+## v231 (10/27/2021)
+
+* Applications with `package.json` now get `nodejs` installed (https://github.com/heroku/heroku-buildpack-ruby/pull/1212)
+* Applications with `yarn.lock` now get `yarn` installed (https://github.com/heroku/heroku-buildpack-ruby/pull/1212)
+
+## v230 (10/5/2021)
+
+* Default Ruby version is now 2.7.4 (https://github.com/heroku/heroku-buildpack-ruby/pull/1193)
+
+## v229 (8/30/2021)
+
+* Fix interoperability with other Heroku buildpacks' `$WEB_CONCURRENCY` handling (https://github.com/heroku/heroku-buildpack-ruby/pull/1188)
+
+## v228 (6/24/2021)
+
+* Bundler 2.x is now 2.2.21 (https://github.com/heroku/heroku-buildpack-ruby/pull/1170)
+* Remove support for the Cedar-14 and Heroku-16 stacks (https://github.com/heroku/heroku-buildpack-ruby/pull/1163)
 
 ## v227 (4/19/2021)
 

Gemfile

@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-ruby '2.6.6'
+ruby '3.1.1'
 
 group :development, :test do
   gem "toml-rb"
@@ -15,4 +15,6 @@ group :development, :test do
   gem 'json'
   gem 'ci-queue'
   gem 'redis'
+  gem 'dead_end'
+  gem 'cutlass'
 end

Gemfile.lock

@@ -1,54 +1,64 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    ci-queue (0.20.5)
+    ci-queue (0.22.1)
     citrus (3.0.2)
-    diff-lcs (1.4.4)
+    cutlass (0.3.0)
+      docker-api (>= 2.0)
+    dead_end (3.1.1)
+    diff-lcs (1.5.0)
+    docker-api (2.2.0)
+      excon (>= 0.47.0)
+      multi_json
     erubis (2.7.0)
-    excon (0.76.0)
-    heroics (0.1.1)
+    excon (0.92.1)
+    heroics (0.1.2)
       erubis (~> 2.0)
       excon
       moneta
       multi_json (>= 1.9.2)
-    heroku_hatchet (7.3.3)
+      webrick
+    heroku_hatchet (7.3.4)
       excon (~> 0)
       platform-api (~> 3)
       rrrretry (~> 1)
       thor (~> 1)
       threaded (~> 0)
-    json (2.3.1)
+    json (2.6.1)
     moneta (1.0.0)
     multi_json (1.15.0)
-    parallel (1.19.2)
-    parallel_tests (3.3.0)
+    parallel (1.22.1)
+    parallel_tests (3.8.1)
       parallel
-    platform-api (3.0.0)
+    platform-api (3.3.0)
       heroics (~> 0.1.1)
       moneta (~> 1.0.0)
       rate_throttle_client (~> 0.1.0)
-    rake (13.0.1)
+    rake (13.0.6)
     rate_throttle_client (0.1.2)
-    redis (4.2.2)
+    redis (4.6.0)
     rrrretry (1.0.0)
-    rspec-core (3.9.3)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.2)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
+      rspec-support (~> 3.11.0)
     rspec-retry (0.6.2)
       rspec-core (> 3.3)
-    rspec-support (3.9.3)
-    thor (1.0.1)
+    rspec-support (3.11.0)
+    thor (1.2.1)
     threaded (0.0.4)
-    toml-rb (2.0.1)
+    toml-rb (2.1.2)
       citrus (~> 3.0, > 3.0)
+    webrick (1.7.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   ci-queue
+  cutlass
+  dead_end
   excon
   heroku_hatchet
   json
@@ -61,7 +71,7 @@ DEPENDENCIES
   toml-rb
 
 RUBY VERSION
-   ruby 2.6.6p146
+   ruby 3.1.1p18
 
 BUNDLED WITH
-   2.1.4
+   2.3.10