diff options
| author | Mathew Robinson <chasinglogic@gmail.com> | 2019-04-29 12:45:27 -0400 |
|---|---|---|
| committer | Mathew Robinson <chasinglogic@gmail.com> | 2019-05-16 11:24:04 -0400 |
| commit | e3b4eaa2cac57826c8f87fb6c23dd8f30de872f0 (patch) | |
| tree | 5a937ee2fa3b202eec2815e683b27c3129eee904 /etc | |
| parent | a07de3fde0e627e5f9b0d71a922cc84b1fce44ef (diff) | |
| download | mongo-e3b4eaa2cac57826c8f87fb6c23dd8f30de872f0.tar.gz | |
SERVER-41039 Fix various build problems with embedded multiarch packaging
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/evergreen.yml | 35 |
1 files changed, 25 insertions, 10 deletions
diff --git a/etc/evergreen.yml b/etc/evergreen.yml index d5806f6f9eb..87c54e489df 100644 --- a/etc/evergreen.yml +++ b/etc/evergreen.yml @@ -880,20 +880,19 @@ functions: EMBEDDED_RELEASE_VERSION="${version}" fi - cd src/src/mongo/embedded/mongo_embedded/java # TODO: Clean this up later where we can remove duplication - if [ ${package_type|embedded-android} = "embedded-jar" ]; then + if [ "${package_type|embedded-android}" = "embedded-jar" ]; then tar zxvf ../../../../../../embedded-sdk-java-linux-x86-64.tgz mkdir -p jniLibs/linux-x86-64 - cp ./mongo-embedded-sdk-$EMBEDDED_RELEASE_VERSION/lib/libmongo_embedded.so jniLibs/linux-x86-64 - rm -rf ./mongo-embedded-sdk-$EMBEDDED_RELEASE_VERSION + cp ./mongo-embedded-sdk-${version}/lib/libmongo_embedded.so jniLibs/linux-x86-64 + rm -rf ./mongo-embedded-sdk-${version} tar zxvf ../../../../../../embedded-sdk-java-darwin.tgz mkdir -p jniLibs/darwin - cp ./mongo-embedded-sdk-$EMBEDDED_RELEASE_VERSION/lib/libmongo_embedded.dylib jniLibs/darwin - rm -rf ./mongo-embedded-sdk-$EMBEDDED_RELEASE_VERSION + cp ./mongo-embedded-sdk-${version}/lib/libmongo_embedded.dylib jniLibs/darwin + rm -rf ./mongo-embedded-sdk-${version} ./gradlew clean :embedded-jar:build :embedded-jar:publishMavenPublicationToLocalRepository @@ -903,8 +902,8 @@ functions: for arch in arm64-v8a armeabi-v7a x86_64 ; do tar zxvf ../../../../../../embedded-sdk-android-$arch.tgz mkdir -p jniLibs/$arch - cp ./mongo-embedded-sdk-$EMBEDDED_RELEASE_VERSION/lib/libmongo_embedded.so jniLibs/$arch - rm -rf ./mongo-embedded-sdk-$EMBEDDED_RELEASE_VERSION + cp ./mongo-embedded-sdk-${version}/lib/libmongo_embedded.so jniLibs/$arch + rm -rf ./mongo-embedded-sdk-${version} done ./gradlew clean :embedded-android:build @@ -3941,6 +3940,8 @@ tasks: - func: "get buildnumber" - func: "set up credentials" - func: "setup android toolchain" # noop if ${setup_android_toolchain} is not "true" + - func: "set task expansion macros" + - func: "set up virtualenv" - func: "generate compile expansions" - func: "apply compile expansions" - command: s3.get @@ -3972,9 +3973,16 @@ tasks: set -o errexit set -o verbose + MINOR_VER=$(echo "${version}" | awk -F. '{print $(NF-1)}') + if [ $(($MINOR_VER % 2)) != 0 ]; then + EMBEDDED_RELEASE_VERSION="${version}-SNAPSHOT" + else + EMBEDDED_RELEASE_VERSION="${version}" + fi + if [ "${setup_android_toolchain|}" = "true" ]; then cd src/build - tar zcvf mongo-embedded-sdk-${version}.tgz mongo-embedded-sdk-${version} + tar zcvf mongo-embedded-sdk-${version}.tgz mongo-embedded-sdk-$EMBEDDED_RELEASE_VERSION fi - command: s3.put params: @@ -4050,9 +4058,16 @@ tasks: set -o errexit set -o verbose + MINOR_VER=$(echo "${version}" | awk -F. '{print $(NF-1)}') + if [ $(($MINOR_VER % 2)) != 0 ]; then + EMBEDDED_RELEASE_VERSION="${version}-SNAPSHOT" + else + EMBEDDED_RELEASE_VERSION="${version}" + fi + if [ "${setup_android_toolchain|}" = "true" ]; then cd src/build - tar zcvf mongo-embedded-sdk-${version}.tgz mongo-embedded-sdk-${version} + tar zcvf mongo-embedded-sdk-${version}.tgz mongo-embedded-sdk-$EMBEDDED_RELEASE_VERSION fi - command: s3.put params: |