Add heroku-24 to CI

heroku · Jun 6, 2024 · bd40f0f · bd40f0f
1 parent 6f2e27d
commit bd40f0f
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        stack: ["heroku-20", "heroku-22"]
+        stack: ["heroku-20", "heroku-22", "heroku-24"]
     env:
       HATCHET_APP_LIMIT: 100
       HATCHET_EXPENSIVE_MODE: 1
@@ -85,12 +85,13 @@ jobs:
     name: "Unit Tests (${{ matrix.stack }})"
     runs-on: ubuntu-22.04
     container:
-      image: "${{ fromJson('{ \"heroku-20\": \"heroku/heroku:20\", \"heroku-22\": \"heroku/heroku:22\" }')[matrix.stack] }}"
+      image: "${{ fromJson('{ \"heroku-20\": \"heroku/heroku:20\", \"heroku-22\": \"heroku/heroku:22\", \"heroku-24\": \"heroku/heroku:24\" }')[matrix.stack] }}"
+      options: --user root
       env:
         STACK: ${{ matrix.stack }}
     strategy:
       matrix:
-        stack: ["heroku-20", "heroku-22"]
+        stack: ["heroku-20", "heroku-22", "heroku-24"]
     steps:
       - uses: actions/checkout@v4
       - run: test/unit
diff --git a/test/spec/db_spec.rb b/test/spec/db_spec.rb
@@ -6,6 +6,7 @@
       Hatchet::Runner.new("java-apache-dbcp-sample", stack: ENV["HEROKU_TEST_STACK"]).tap do |app|
         app.before_deploy do
           set_java_version(DEFAULT_OPENJDK_VERSION)
+          app.add_database("heroku-postgresql:essential-0")
         end
 
         app.deploy do

diff --git a/test/spec/java_spec.rb b/test/spec/java_spec.rb
@@ -7,6 +7,7 @@
         Hatchet::Runner.new("java-servlets-sample", stack: ENV["HEROKU_TEST_STACK"]).tap do |app|
           app.before_deploy do
             set_java_version(openjdk_version)
+            app.add_database("heroku-postgresql:essential-0")
           end
 
           app.deploy do

diff --git a/test/spec/maven_spec.rb b/test/spec/maven_spec.rb
@@ -23,6 +23,7 @@
         app.before_deploy do
           set_java_version(DEFAULT_OPENJDK_VERSION)
           set_maven_version("3.2.5")
+          app.add_database("heroku-postgresql:essential-0")
         end
 
         app.deploy do

diff --git a/test/spec/spec_helper.rb b/test/spec/spec_helper.rb
@@ -3,9 +3,7 @@
 require "hatchet"
 require "java-properties"
 
-# Omitting 1.7 here since most example projects used in testing are not
-# compatible with 1.7.
-OPENJDK_VERSIONS=%w(1.8 11 13 15)
+OPENJDK_VERSIONS=%w(1.8 11 17 21)
 DEFAULT_OPENJDK_VERSION="1.8"
 
 RSpec.configure do |config|