ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-18 02:39:51 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'release/os/4.5' into NOTICK-rfowler-merge-OS4.5-OS4.6-20200626

Browse Source
This commit is contained in:
Ryan Fowler 2020-06-26 12:14:56 +01:00
commit 31a1ee8803
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.ci/dev/mswin/Jenkinsfile vendored
View File

@ -55,7 +55,7 @@ pipeline {
stage('Unit Tests') {
agent { label 'mswin' }
steps {
sh "./gradlew --no-daemon " +
bat "./gradlew --no-daemon " +
"--stacktrace " +
"-Pcompilation.warningsAsErrors=false " +
"-Ptests.failFast=true " +
@ -80,7 +80,7 @@ pipeline {
}
agent { label 'mswin' }
steps {
sh "./gradlew --no-daemon " +
bat "./gradlew --no-daemon " +
"clean integrationTest"
}
post {

2
node/src/integration-test/kotlin/net/corda/node/NodeRPCTests.kt
View File

@ -11,7 +11,7 @@ import kotlin.test.assertEquals
import kotlin.test.assertTrue
class NodeRPCTests {
private val CORDA_VERSION_REGEX = "\\d+(\\.\\d+)?(-\\w+)?".toRegex()
private val CORDA_VERSION_REGEX = "\\d+(\\.\\d+)?(\\.\\d+)?(-\\w+)?".toRegex()
private val CORDA_VENDOR = "Corda Open Source"
private val CORDAPPS = listOf(FINANCE_CONTRACTS_CORDAPP, FINANCE_WORKFLOWS_CORDAPP)
private val CORDAPP_TYPES = setOf("Contract CorDapp", "Workflow CorDapp")