Enable windows build, set mac builds for gitlab runners

This commit is contained in:
Ugljesa Jovanovic 2020-10-20 19:34:22 +02:00
parent a210ef2db3
commit 2455c0fcea
No known key found for this signature in database
GPG Key ID: 178E6DFCECCB0E0F
6 changed files with 67 additions and 5 deletions

View File

@ -17,6 +17,7 @@ simpleCheck:
script: echo PREPARE
tags:
- linuxX64
# ---- Linux builds ----
buildLinux:
stage: build
@ -26,6 +27,21 @@ buildLinux:
- ./linuxBuild.sh
tags:
- linuxX64
linuxPublishToSnapshot:
script:
- ./linuxBuild.sh
- ./linuxBuildAndPublish.sh
rules:
- if: '$CI_COMMIT_BRANCH == "master"'
- allow_failure: false
needs:
- job: buildLinux
tags:
- linuxX64
# ---- Mac builds ----
buildMac:
stage: build
when: manual
@ -34,11 +50,40 @@ buildMac:
- ./macBuild.sh
tags:
- macos
macPublishToSnapshot:
script:
- ./macBuild.sh
- ./macBuildAndPublishSnapshot-bindings.sh
- ./macBuildAndPublishSnapshot-delegated.sh
rules:
- if: '$CI_COMMIT_BRANCH == "master"'
- allow_failure: false
needs:
- job: buildMac
tags:
- macos
# ---- Windows builds ----
buildWindows:
stage: build
when: manual
allow_failure: false
script: echo TEST_PULL_REQUEST_WIN
script:
- ./windowsBuild-delegated.sh
- ./windowsBuild-pure.sh
tags:
- windowsX64
windowsPublishToSnapshot:
script:
- ./windowsBuildAndPublish-delegated.sh
- ./windowsBuildAndPublish-pure.sh
rules:
- if: '$CI_COMMIT_BRANCH == "master"'
- allow_failure: false
needs:
- job: buildWindows
tags:
- windowsX64

View File

@ -12,4 +12,5 @@ cd ..
#pure build
./gradlew multiplatform-crypto:build
#libsodium bindings
./gradlew multiplatform-crypto-libsodium-bindings:build
set +e

View File

@ -0,0 +1,15 @@
set -e
#!/bin/sh
./gradlew multiplatform-crypto-delegated:publishMacosX64PublicationToSnapshotRepository
./gradlew multiplatform-crypto-delegated:publishIosArm32PublicationToSnapshotRepository \
multiplatform-crypto-delegated:publishIosArm64PublicationToSnapshotRepository \
multiplatform-crypto-delegated:publishIosX64PublicationToSnapshotRepository
./gradlew multiplatform-crypto-delegated:publishWatchosArm32PublicationToSnapshotRepository \
multiplatform-crypto-delegated:publishWatchosArm64PublicationToSnapshotRepository \
multiplatform-crypto-delegated:publishWatchosX86PublicationToSnapshotRepository
./gradlew multiplatform-crypto-delegated:publishTvosArm64PublicationToSnapshotRepository \
multiplatform-crypto-delegated:publishTvosX64PublicationToSnapshotRepository
set +e

View File

@ -12,6 +12,7 @@ import libsodium.sodium_memcmp
import libsodium.sodium_memzero
import libsodium.sodium_pad
import libsodium.sodium_unpad
import platform.posix.size_tVar
/**
* Created by Ugljesa Jovanovic

View File

@ -7,9 +7,9 @@ cd sodiumWrapper
echo "Starting mingw libsodium build"
./configureMingw64.sh
echo "Configure done"
$GNU_MAKE -j4 -C libsodium clean
$GNU_MAKE -j4 -C libsodium
$GNU_MAKE -j4 -C libsodium install
make -j4 -C libsodium clean
make -j4 -C libsodium
make -j4 -C libsodium install
echo "completed libsodium build"
#now we can do the delegated build
cd ..