Skip to content

Fix CI #167

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.

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

Merged
merged 1 commit into from
Apr 9, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions test/spec/cljs_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
end

app.deploy do
expect(app.output).to include("Installing OpenJDK #{DEFAULT_OPENJDK_VERSION}")
expect(app.output).to match(/Installing (Heroku|Azul Zulu) OpenJDK #{DEFAULT_OPENJDK_VERSION}/)
expect(app.output).to match(/Downloading: leiningen-2.[5-9].[0-9]-standalone.jar/)
expect(app.output).to include("Running: lein uberjar")

Expand All @@ -25,7 +25,7 @@
end

app.deploy do
expect(app.output).to include("Installing OpenJDK #{DEFAULT_OPENJDK_VERSION}")
expect(app.output).to match(/Installing (Heroku|Azul Zulu) OpenJDK #{DEFAULT_OPENJDK_VERSION}/)
expect(app.output).to match(/Downloading: leiningen-2.[5-9].[0-9]-standalone.jar/)
expect(app.output).to include("Running: lein with-profile production do deps, compile :all")

Expand Down
6 changes: 3 additions & 3 deletions test/spec/compile_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
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 8... done")
expect(app.output).to include("Installing Azul Zulu OpenJDK 1.8")
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 @@ -16,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 8... done")
expect(app.output).to include("Installing Azul Zulu OpenJDK 1.8")
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 @@ -26,7 +26,7 @@
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 8... done")
expect(app.output).to include("Installing Azul Zulu OpenJDK 1.8")
expect(app.output).to include("Running: lein uberjar")
end
end
Expand Down
2 changes: 1 addition & 1 deletion test/spec/compojure_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
end

app.deploy do
expect(app.output).to include("Installing OpenJDK #{DEFAULT_OPENJDK_VERSION}")
expect(app.output).to match(/Installing (Heroku|Azul Zulu) OpenJDK #{DEFAULT_OPENJDK_VERSION}/)
expect(app.output).to match(/Downloading: leiningen-2.[0-9].[0-9]-standalone.jar/)
expect(app.output).to include("Running: lein uberjar")
expect(http_get(app)).to include('["Hello" :from Heroku]')
Expand Down
2 changes: 1 addition & 1 deletion test/spec/fixtures/repos/lein-1-jdk-8/system.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
java.runtime.version=8
java.runtime.version=zulu-8
Original file line number Diff line number Diff line change
@@ -1 +1 @@
java.runtime.version=8
java.runtime.version=zulu-8
2 changes: 1 addition & 1 deletion test/spec/fixtures/repos/lein-2-jdk-8/system.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
java.runtime.version=8
java.runtime.version=zulu-8