Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Heroku-24 to CI #157

Merged
merged 1 commit into from
Jun 5, 2024
Merged

Add Heroku-24 to CI #157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
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
View file
Open in desktop

This file was deleted.

29 changes: 3 additions & 26 deletions test/spec/compile_spec.rb
View file
Open in desktop
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
1 change: 1 addition & 0 deletions test/spec/fixtures/repos/cljs-lein-npm-example/system.properties
View file
Open in desktop
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/cljs-nodejs-example/system.properties
View file
Open in desktop
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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
java.runtime.version=8
3 changes: 2 additions & 1 deletion test/spec/fixtures/repos/clojurescript-example/system.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
java.runtime.version=1.8

java.runtime.version=8
1 change: 1 addition & 0 deletions test/spec/fixtures/repos/immutant-feature-demo/system.properties
View file
Open in desktop
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
View file
Open in desktop

This file was deleted.

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

This file was deleted.

1 change: 0 additions & 1 deletion test/spec/fixtures/repos/lein-1-jdk-7/system.properties
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions test/spec/fixtures/repos/lein-1-jdk-8/system.properties
View file
Open in desktop
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-uberjar/system.properties
View file
Open in desktop
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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
java.runtime.version=8