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

Jump to bottom

chore: Unignore Hydra tests #2113

Closed
wants to merge 1 commit into from
Closed

chore: Unignore Hydra tests #2113

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
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ jobs:

- name: Compile and test main projects
run: |
mkdir -p $HOME/.triplequote && echo "$HYDRA_LICENSE" > "$HOME/.triplequote/hydra.license"
sbt \
"frontend/test:compile; \
backend/test; \
Expand Down
17 changes: 9 additions & 8 deletions frontend/src/test/scala/bloop/HydraCompileSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package bloop

import java.nio.file.Paths

import scala.tools.nsc.Properties

import bloop.io.AbsolutePath
Expand All @@ -22,7 +24,7 @@ object HydraCompileSpec extends BaseCompileSpec {
private val TriplequoteResolver = MavenRepository.of(
"https://repo.triplequote.com/artifactory/libs-release/"
)
private val HydraVersion = "2.2.2"
private val HydraVersion = "2.3.11"

object HydraTestProject extends bloop.util.BaseTestProject {
override protected def mkScalaInstance(
Expand Down Expand Up @@ -53,14 +55,13 @@ object HydraCompileSpec extends BaseCompileSpec {
}
}

// private lazy val hydraLicenseExists: Boolean = {
// val hydraLicense = Paths.get(System.getProperty("user.home"), ".triplequote", "hydra.license")
// hydraLicense.toFile.exists()
// }
private lazy val hydraLicenseExists: Boolean = {
val hydraLicense = Paths.get(System.getProperty("user.home"), ".triplequote", "hydra.license")
hydraLicense.toFile.exists()
}

override def test(name: String)(fun: => Any): Unit = {
// if (hydraLicenseExists) super.test(name)(fun)
// else ignore(name, "Hydra license is missing")(fun)
ignore(name, "Hydra license is missing")(fun)
if (hydraLicenseExists) super.test(name)(fun)
else ignore(name, "Hydra license is missing")(fun)
}
}
Loading