Skip to content

Commit

Permalink
Add Heroku-24 to CI (#157)
Browse files Browse the repository at this point in the history
  • Loading branch information
Malax authored Jun 5, 2024
1 parent 3d7f6d3 commit cc5139b
Show file tree
Hide file tree
Showing 14 changed files with 13 additions and 60 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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_RUN_MULTI: 1
Expand Down
14 changes: 0 additions & 14 deletions test/spec/compatibility_spec.rb

This file was deleted.

29 changes: 3 additions & 26 deletions test/spec/compile_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,10 @@

describe "Heroku's Clojure Support" do

it "compiles a project without min-lein-version with JDK 1.7" do
new_default_hatchet_runner("test/spec/fixtures/repos/lein-1-jdk-7").tap do |app|
app.deploy do
expect(app.output).to include("Installing OpenJDK 1.7... done")
expect(app.output).to include("No :min-lein-version found in project.clj; using 1.7.1.")
expect(app.output).to include("To use Leiningen 2.x, add this to project.clj: :min-lein-version \"2.0.0\"")
expect(app.output).to include("Downloading: leiningen-1.7.1-standalone.jar")
end
end
end

it "compiles a project without :min-lein-version with the default JDK version" do
new_default_hatchet_runner("test/spec/fixtures/repos/lein-1-jdk-8").tap do |app|
app.deploy do
expect(app.output).to include("Installing OpenJDK 1.8... done")
expect(app.output).to include("Installing OpenJDK 8... done")
expect(app.output).to include("No :min-lein-version found in project.clj; using 1.7.1.")
expect(app.output).to include("To use Leiningen 2.x, add this to project.clj: :min-lein-version \"2.0.0\"")
expect(app.output).to include("Downloading: leiningen-1.7.1-standalone.jar")
Expand All @@ -27,7 +16,7 @@
it "compiles a project with :min-lein-version set to 2.0.0 with the default JDK version" do
new_default_hatchet_runner("test/spec/fixtures/repos/lein-2-jdk-8").tap do |app|
app.deploy do
expect(app.output).to include("Installing OpenJDK 1.8... done")
expect(app.output).to include("Installing OpenJDK 8... done")
expect(app.output).to include("Downloading: leiningen-2.9.1-standalone.jar")
expect(app.output).not_to include("WARNING: no :min-lein-version found in project.clj; using 1.7.1.")
end
Expand All @@ -37,22 +26,10 @@
it "runs `lein uberjar` when the project has a :uberjar-name setting" do
new_default_hatchet_runner("test/spec/fixtures/repos/lein-2-jdk-8-uberjar").tap do |app|
app.deploy do
expect(app.output).to include("Installing OpenJDK 1.8... done")
expect(app.output).to include("Installing OpenJDK 8... done")
expect(app.output).to include("Running: lein uberjar")
end
end
end

it "uses a cached Leiningen for subsequent builds" do
new_default_hatchet_runner("test/spec/fixtures/repos/lein-1-jdk-7").tap do |app|
app.deploy do
expect(app.output).not_to include("Using cached Leiningen")

app.commit!
app.push!

expect(app.output).to include("Using cached Leiningen")
end
end
end
end
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
java.runtime.version=8
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
java.runtime.version=8
1 change: 1 addition & 0 deletions test/spec/fixtures/repos/clojure-minimal/system.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
java.runtime.version=8
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
java.runtime.version=1.8

java.runtime.version=8
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
java.runtime.version=8
12 changes: 0 additions & 12 deletions test/spec/fixtures/repos/lein-1-jdk-7/project.clj

This file was deleted.

5 changes: 0 additions & 5 deletions test/spec/fixtures/repos/lein-1-jdk-7/source/sample/core.clj

This file was deleted.

1 change: 0 additions & 1 deletion test/spec/fixtures/repos/lein-1-jdk-7/system.properties

This file was deleted.

1 change: 1 addition & 0 deletions test/spec/fixtures/repos/lein-1-jdk-8/system.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
java.runtime.version=8
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
java.runtime.version=8
1 change: 1 addition & 0 deletions test/spec/fixtures/repos/lein-2-jdk-8/system.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
java.runtime.version=8

0 comments on commit cc5139b

Please sign in to comment.