diff --git a/.gitlab-ci-files/job-android.yml b/.gitlab-ci-files/job-android.yml index 86c4f3f31dc3304942b79ae1f94ef4ff13480865..2548af2954f27a350419f53c8a6b3c8b34ea5d78 100644 --- a/.gitlab-ci-files/job-android.yml +++ b/.gitlab-ci-files/job-android.yml @@ -23,9 +23,11 @@ - echo $CMAKE_OPTIONS - cmake .. -G "$CMAKE_GENERATOR" -DLINPHONESDK_PLATFORM=Android -DLINPHONESDK_ANDROID_ARCHS="$ANDROID_ARCHS" $DEFAULT_LINUX_CMAKE_OPTIONS $CMAKE_OPTIONS $SCHEDULE_CMAKE_OPTIONS $CMAKE_SANITIZER_OPTIONS - cmake --build . --target sdk -- $ADDITIONAL_BUILD_OPTIONS + - echo $(git describe) > gitdescribe.txt artifacts: paths: + - build/gitdescribe.txt - build/linphone-sdk/bin/outputs/aar/*.aar - build/linphone-sdk/bin/libs/linphone-sdk-android-javadoc.jar - build/linphone-sdk/bin/libs/linphone-sdk-android-sources.jar diff --git a/.gitlab-ci-files/job-ios.yml b/.gitlab-ci-files/job-ios.yml index 03b93ca24afe46e33d46440514512114b235c164..a7844c3228c25c55972d6ba16e45d4f674116081 100644 --- a/.gitlab-ci-files/job-ios.yml +++ b/.gitlab-ci-files/job-ios.yml @@ -25,9 +25,11 @@ - cmake --log-level=ERROR -L ../CMakeLists.txt | grep LINPHONESDK_VERSION_CACHED | cut -d "=" -f2 > linphonesdkversion.txt - cat linphonesdkversion.txt - ccache -s + - echo $(git describe) > gitdescribe.txt artifacts: paths: + - build-ios/gitdescribe.txt - build-ios/linphonesdkversion.txt - build-ios/linphone-sdk-*.zip - build-ios/*.podspec diff --git a/.gitlab-ci-files/job-macosx.yml b/.gitlab-ci-files/job-macosx.yml index 0d4d9c86c546b398bfd3010b879c97d2996ead57..cb27dbe148bcc7d62263377bce57a43ec6f9c64d 100644 --- a/.gitlab-ci-files/job-macosx.yml +++ b/.gitlab-ci-files/job-macosx.yml @@ -35,9 +35,11 @@ - ls -t linphone-sdk-*.zip > sdk_archive_name.txt - cat sdk_archive_name.txt - ccache -s + - echo $(git describe) > gitdescribe.txt artifacts: paths: + - build-desktop/gitdescribe.txt - build-desktop/sdk_archive_name.txt - build-desktop/linphone-sdk-*.zip - build-desktop/linphone-sdk.podspec diff --git a/.gitlab-ci-files/job-uploads.yml b/.gitlab-ci-files/job-uploads.yml index 229149cbd8b8375c4451d1c20fdcd36e689d4420..b73193d702c93ee81d4ba4b4f45629fc6e2f7e11 100644 --- a/.gitlab-ci-files/job-uploads.yml +++ b/.gitlab-ci-files/job-uploads.yml @@ -461,7 +461,7 @@ job-xamarin-upload: - MS2_VERSION=$(git -C mediastreamer2 describe) #We get the SDK version from earlier jobs instead of using git describe so the URL generated in the tester job will be the same in the upload job, no matter the platform used and the git version delta - - SDK_VERSION=$(cat ${CI_PROJECT_DIR}/build-desktop/gitdescribe.txt) + - SDK_VERSION=$(cat ${CI_PROJECT_DIR}/build*/gitdescribe.txt) - echo $SDK_VERSION - git describe