Skip to content

Commit 3d5a21e

Browse files
authored
Fix CI (#167)
1 parent 1a986c9 commit 3d5a21e

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
lines changed

Diff for: test/spec/cljs_spec.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
end
1010

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

@@ -25,7 +25,7 @@
2525
end
2626

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

Diff for: test/spec/compile_spec.rb

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
it "compiles a project without :min-lein-version with the default JDK version" do
66
new_default_hatchet_runner("test/spec/fixtures/repos/lein-1-jdk-8").tap do |app|
77
app.deploy do
8-
expect(app.output).to include("Installing OpenJDK 8... done")
8+
expect(app.output).to include("Installing Azul Zulu OpenJDK 1.8")
99
expect(app.output).to include("No :min-lein-version found in project.clj; using 1.7.1.")
1010
expect(app.output).to include("To use Leiningen 2.x, add this to project.clj: :min-lein-version \"2.0.0\"")
1111
expect(app.output).to include("Downloading: leiningen-1.7.1-standalone.jar")
@@ -16,7 +16,7 @@
1616
it "compiles a project with :min-lein-version set to 2.0.0 with the default JDK version" do
1717
new_default_hatchet_runner("test/spec/fixtures/repos/lein-2-jdk-8").tap do |app|
1818
app.deploy do
19-
expect(app.output).to include("Installing OpenJDK 8... done")
19+
expect(app.output).to include("Installing Azul Zulu OpenJDK 1.8")
2020
expect(app.output).to include("Downloading: leiningen-2.9.1-standalone.jar")
2121
expect(app.output).not_to include("WARNING: no :min-lein-version found in project.clj; using 1.7.1.")
2222
end
@@ -26,7 +26,7 @@
2626
it "runs `lein uberjar` when the project has a :uberjar-name setting" do
2727
new_default_hatchet_runner("test/spec/fixtures/repos/lein-2-jdk-8-uberjar").tap do |app|
2828
app.deploy do
29-
expect(app.output).to include("Installing OpenJDK 8... done")
29+
expect(app.output).to include("Installing Azul Zulu OpenJDK 1.8")
3030
expect(app.output).to include("Running: lein uberjar")
3131
end
3232
end

Diff for: test/spec/compojure_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
end
1010

1111
app.deploy do
12-
expect(app.output).to include("Installing OpenJDK #{DEFAULT_OPENJDK_VERSION}")
12+
expect(app.output).to match(/Installing (Heroku|Azul Zulu) OpenJDK #{DEFAULT_OPENJDK_VERSION}/)
1313
expect(app.output).to match(/Downloading: leiningen-2.[0-9].[0-9]-standalone.jar/)
1414
expect(app.output).to include("Running: lein uberjar")
1515
expect(http_get(app)).to include('["Hello" :from Heroku]')
+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
java.runtime.version=8
1+
java.runtime.version=zulu-8
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
java.runtime.version=8
1+
java.runtime.version=zulu-8
+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
java.runtime.version=8
1+
java.runtime.version=zulu-8

0 commit comments

Comments
 (0)