Skip to content

Commit 0c63595

Browse files
authored
Install JBR on CI and enable back hot reload tests (#5461)
Install JBR on CI and enable back hot reload tests ## Release Notes N/A
1 parent c205451 commit 0c63595

File tree

2 files changed

+9
-6
lines changed
  • ci/docker/linux-tests
  • gradle-plugins/compose/src/test/kotlin/org/jetbrains/compose/test/tests/integration

2 files changed

+9
-6
lines changed

ci/docker/linux-tests/Dockerfile

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,14 @@ RUN apt update -y && \
4343
ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8
4444
ENV JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF-8
4545

46+
# Install JBR
47+
ARG JBR_DISTR=jbr_jcef-21.0.8-linux-x64-b1163.62
48+
ARG JBR_DISTR_ARCH=$JBR_DISTR.tar.gz
49+
RUN wget https://cache-redirector.jetbrains.com/intellij-jbr/$JBR_DISTR_ARCH && \
50+
tar xzf $JBR_DISTR_ARCH && \
51+
rm $JBR_DISTR_ARCH && \
52+
mv $JBR_DISTR /usr/lib/jvm
53+
4654
# Install Android SDK
4755
ENV ANDROID_HOME=/android/sdk
4856
ARG CMD_TOOLS_VERSION=13114758
@@ -61,7 +69,7 @@ RUN yes | $SDK_MANAGER --licenses && \
6169
ls -1 | grep -v android.jar | xargs rm -rf
6270

6371
# Install Google Chrome
64-
ARG CHROME_VERSION="140.0.7339.127-1"
72+
ARG CHROME_VERSION="141.0.7390.122-1"
6573
# https://googlechromelabs.github.io/chrome-for-testing/
6674
ARG CHROME_DRIVER_VERSION="140.0.7339.82"
6775
ARG CHROME_BIN=/usr/bin/google-chrome-stable

gradle-plugins/compose/src/test/kotlin/org/jetbrains/compose/test/tests/integration/HotReloadTest.kt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,18 @@ import org.jetbrains.compose.ComposeBuildConfig
66
import org.jetbrains.compose.desktop.application.internal.ComposeProperties
77
import org.jetbrains.compose.test.utils.GradlePluginTestBase
88
import org.jetbrains.compose.test.utils.checks
9-
import org.junit.jupiter.api.Disabled
109
import org.junit.jupiter.api.fail
1110
import org.junit.jupiter.api.Test
1211
import kotlin.concurrent.thread
1312

1413
class HotReloadTest : GradlePluginTestBase() {
15-
@Disabled("TODO: install JBR on CI for the test to pass")
1614
@Test
1715
fun testHotReloadTaskRegisteredInJvmProject() = with(testProject("application/jvm")) {
1816
gradle("hotRun", "--dry-run").checks {
1917
check.taskSkipped(":hotRun")
2018
}
2119
}
2220

23-
@Disabled("TODO: install JBR on CI for the test to pass")
2421
@Test
2522
fun testHotReloadTaskRegisteredInKmpProject() = with(testProject("application/mpp")) {
2623
gradle("hotRunJvm", "--dry-run").checks {
@@ -49,7 +46,6 @@ class HotReloadTest : GradlePluginTestBase() {
4946
Thread.sleep(1000)
5047
}
5148

52-
@Disabled("TODO: install JBR on CI for the test to pass")
5349
@Test
5450
fun testHotReload() = with(testProject("application/hotReload")) {
5551
var result: BuildResult? = null
@@ -95,7 +91,6 @@ class HotReloadTest : GradlePluginTestBase() {
9591
gradleRunnerWorkaround()
9692
}
9793

98-
@Disabled("TODO: install JBR on CI for the test to pass")
9994
@Test
10095
fun testExternalHotReload() = with(testProject("application/mpp")) {
10196
val externalHotReloadVersion = "1.0.0-rc01"

0 commit comments

Comments
 (0)