Use testKotlinVersion as a build version to get tests from
This commit is contained in:
committed by
Pavel Punegov
parent
6c4ec4c3f0
commit
32135429e4
@@ -54,7 +54,7 @@ repositories {
|
||||
|
||||
dependencies {
|
||||
cli_bc project(path: ':backend.native', configuration: 'cli_bc')
|
||||
update_tests (group: 'org', name: 'Kotlin_dev_CompilerAllPlugins', version: kotlinVersion) {
|
||||
update_tests (group: 'org', name: 'Kotlin_dev_CompilerAllPlugins', version: testKotlinVersion) {
|
||||
artifact {
|
||||
name = 'internal/kotlin-test-data'
|
||||
type = 'zip'
|
||||
@@ -119,15 +119,13 @@ task update_external_tests() {
|
||||
// Unzip.
|
||||
delete temporaryDir
|
||||
copy {
|
||||
// configurations.update_tests.asFileTree.each {
|
||||
// from(zipTree(it)) {
|
||||
from(zipTree(file('/Users/ppunegov/ws/kotlin/dist/kotlin-test-data.zip'))) {
|
||||
|
||||
include('compiler/**', 'stdlib/**')
|
||||
configurations.update_tests.asFileTree.each {
|
||||
from(zipTree(it)) {
|
||||
include('compiler/**', 'stdlib/**')
|
||||
}
|
||||
into(temporaryDir)
|
||||
into(temporaryDir)
|
||||
}
|
||||
}
|
||||
|
||||
// Copy only used tests into the test directory.
|
||||
externalTestsDir.mkdirs()
|
||||
delete("${externalTestsDir.canonicalPath}/codegen")
|
||||
|
||||
@@ -19,6 +19,7 @@ buildKotlinVersion=1.2.50
|
||||
remoteRoot=konan_tests
|
||||
kotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_CompilerAllPlugins),number:1.2.70-dev-1218,tag:kotlin-native,pinned:true/artifacts/content/maven
|
||||
kotlinVersion=1.2.70-dev-1218
|
||||
testKotlinVersion=1.2.70-dev-979
|
||||
konanVersion=0.9
|
||||
org.gradle.jvmargs='-Dfile.encoding=UTF-8'
|
||||
|
||||
|
||||
Reference in New Issue
Block a user