Merge pull request #19 from ionspin/gitlab-ci-mac

Gitlab ci mac
This commit is contained in:
Ugljesa Jovanovic 2020-10-09 14:54:17 +00:00 committed by GitHub
commit f4d6d941c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 3 deletions

View File

@ -30,7 +30,8 @@ buildMac:
stage: build stage: build
when: manual when: manual
allow_failure: false allow_failure: false
script: echo TEST_PULL_REQUEST_MAC script:
- ./macBuild.sh
tags: tags:
- macos - macos
buildWindows: buildWindows:

View File

@ -138,6 +138,7 @@ Currently supported native platforms:
- Complete the bindings list - Complete the bindings list
- Samples - Samples
- Android testing - Android testing
- Fix browser testing, both locally and in CI/CD

View File

@ -37,6 +37,8 @@ fun getHostArchitecture(): String {
return resolvedArch return resolvedArch
} }
fun KotlinMultiplatformExtension.isRunningInIdea(block: KotlinMultiplatformExtension.() -> Unit) { fun KotlinMultiplatformExtension.isRunningInIdea(block: KotlinMultiplatformExtension.() -> Unit) {
if (isInIdea()) { if (isInIdea()) {
block(this) block(this)
@ -109,4 +111,4 @@ fun NamedDomainObjectContainer<KotlinSourceSet>.createWorkaroundNativeMainSource
} }
} }
} }

View File

@ -57,7 +57,6 @@ version = ReleaseInfo.version
val ideaActive = isInIdea() val ideaActive = isInIdea()
println("Idea active: $ideaActive") println("Idea active: $ideaActive")
android { android {
compileSdkVersion(29) compileSdkVersion(29)
defaultConfig { defaultConfig {
@ -75,6 +74,7 @@ android {
} }
kotlin { kotlin {
val hostOsName = getHostOsName() val hostOsName = getHostOsName()
runningOnLinuxx86_64 { runningOnLinuxx86_64 {

View File

@ -78,7 +78,9 @@ class LibsodiumUtilTest {
val input = ubyteArrayOf(1U, 2U) val input = ubyteArrayOf(1U, 2U)
val blocksize = 2 val blocksize = 2
val padded = LibsodiumUtil.pad(input, blocksize) val padded = LibsodiumUtil.pad(input, blocksize)
val expected = ubyteArrayOf(1U, 2U, 0x80U, 0x00U)
println(padded.hexColumsPrint()) println(padded.hexColumsPrint())
assertTrue { padded.contentEquals(expected) }
val unpadded = LibsodiumUtil.unpad(padded, blocksize) val unpadded = LibsodiumUtil.unpad(padded, blocksize)
println(unpadded.hexColumsPrint()) println(unpadded.hexColumsPrint())
@ -94,7 +96,9 @@ class LibsodiumUtilTest {
val input = ubyteArrayOf(1U, 2U, 3U, 4U, 5U, 6U) val input = ubyteArrayOf(1U, 2U, 3U, 4U, 5U, 6U)
val blocksize = 4 val blocksize = 4
val padded = LibsodiumUtil.pad(input, blocksize) val padded = LibsodiumUtil.pad(input, blocksize)
val expected = ubyteArrayOf(1U, 2U, 3U, 4U, 5U, 6U, 0x80U, 0x00U)
println(padded.hexColumsPrint()) println(padded.hexColumsPrint())
assertTrue { padded.contentEquals(expected) }
val unpadded = LibsodiumUtil.unpad(padded, blocksize) val unpadded = LibsodiumUtil.unpad(padded, blocksize)
println(unpadded.hexColumsPrint()) println(unpadded.hexColumsPrint())