MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-03-22 15:19:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

build scripts: snap docker image in dependencies.properties

Browse Source 
GitOrigin-RevId: f6c670d415ed31cc0e3258e5bba56459856ca62f
This commit is contained in:
Dmitriy.Panov
2024-06-14 14:08:11 +02:00
committed by intellij-monorepo-bot
parent b66ffdcb07
commit 5b28275172
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
build/dependencies/dependencies.properties
View File

@@ -7,3 +7,4 @@ launcherBuild=242.14310
nsisBuild=1
restarterBuild=242.9890
runtimeBuild=21.0.3b499.2
snapDockerImage=snapcore/snapcraft:stable@sha256:6d771575c134569e28a590f173f7efae8bf7f4d1746ad8a474c98e02f4a3f627

11
platform/build-scripts/src/org/jetbrains/intellij/build/BuildOptions.kt
View File

@@ -8,6 +8,8 @@ import kotlinx.collections.immutable.persistentListOf
import kotlinx.collections.immutable.toPersistentMap
import org.jetbrains.annotations.ApiStatus
import org.jetbrains.annotations.TestOnly
import org.jetbrains.intellij.build.BuildPaths.Companion.COMMUNITY_ROOT
import org.jetbrains.intellij.build.dependencies.DependenciesProperties
import org.jetbrains.intellij.build.dependencies.TeamCityHelper
import org.jetbrains.jps.api.GlobalOptions
import java.nio.file.Path
@@ -314,9 +316,6 @@ data class BuildOptions(
*/
const val IJENT_EXECUTABLE_DOWNLOADING: String = "ijent.executable.downloading"
@Suppress("SpellCheckingInspection")
private const val DEFAULT_SNAP_TOOL_IMAGE = "snapcore/snapcraft:stable@sha256:6d771575c134569e28a590f173f7efae8bf7f4d1746ad8a474c98e02f4a3f627"
private fun parseBooleanValue(text: String): Boolean = when {
text.toBoolean() -> true
text.equals(false.toString(), ignoreCase = true) -> false
@@ -337,6 +336,10 @@ data class BuildOptions(
}
return value
}
private val DEPENDENCIES_PROPERTIES: DependenciesProperties by lazy {
DependenciesProperties(COMMUNITY_ROOT)
}
}
/**
@@ -368,7 +371,7 @@ data class BuildOptions(
/**
* Docker image for snap package creation
*/
var snapDockerImage: String = System.getProperty("intellij.build.snap.docker.image", DEFAULT_SNAP_TOOL_IMAGE)
var snapDockerImage: String = System.getProperty("intellij.build.snap.docker.image") ?: DEPENDENCIES_PROPERTIES["snapDockerImage"]
var snapDockerBuildTimeoutMin: Long = System.getProperty("intellij.build.snap.timeoutMin", "20").toLong()
/**