-
Notifications
You must be signed in to change notification settings - Fork 44
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'release/v7.1.0' into 'master'
Release 7.1.0 See merge request megachat/MEGAchat!2001
- Loading branch information
Showing
22 changed files
with
650 additions
and
179 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
90 changes: 90 additions & 0 deletions
90
jenkinsfile/specific_branches/MEGAChat_crossiOS_develop.groovy
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,90 @@ | ||
| pipeline { | ||
| agent { label 'osx && arm64' } | ||
| options { | ||
| buildDiscarder(logRotator(numToKeepStr: '135', daysToKeepStr: '21')) | ||
| gitLabConnection('GitLabConnectionJenkins') | ||
| ansiColor('xterm') | ||
| } | ||
| environment { | ||
| APIURL_TO_TEST = "https://g.api.mega.co.nz/" | ||
| IOS_BRANCH = "develop" | ||
| SDK_BRANCH = "develop" | ||
| MEGACHAT_BRANCH = "develop" | ||
| } | ||
| stages { | ||
| stage('Checkout SDK MEGAchat and iOS'){ | ||
| steps { | ||
| deleteDir() | ||
| checkout([ | ||
| $class: 'GitSCM', | ||
| branches: [[name: "origin/${env.IOS_BRANCH}"]], | ||
| userRemoteConfigs: [[ url: "[email protected]:mobile/ios/iOS_dev.git", credentialsId: "12492eb8-0278-4402-98f0-4412abfb65c1" ]], | ||
| extensions: [ | ||
| [$class: "UserIdentity",name: "jenkins", email: "jenkins@jenkins"] | ||
| ] | ||
| ]) | ||
| dir("Modules/DataSource/MEGAChatSDK/Sources/MEGAChatSDK"){ | ||
| checkout([ | ||
| $class: 'GitSCM', | ||
| branches: [[name: "origin/${env.MEGACHAT_BRANCH}"]], | ||
| userRemoteConfigs: [[ url: "[email protected]:megachat/MEGAchat.git", credentialsId: "12492eb8-0278-4402-98f0-4412abfb65c1" ]], | ||
| extensions: [ | ||
| [$class: "UserIdentity",name: "jenkins", email: "jenkins@jenkins"], | ||
| ] | ||
| ]) | ||
| } | ||
| dir('Modules/Datasource/MEGASDK/Sources/MEGASDK'){ | ||
| checkout([ | ||
| $class: 'GitSCM', | ||
| branches: [[name: "origin/${env.SDK_BRANCH}"]], | ||
| userRemoteConfigs: [[ url: "[email protected]:sdk/sdk.git", credentialsId: "12492eb8-0278-4402-98f0-4412abfb65c1" ]], | ||
| extensions: [ | ||
| [$class: "UserIdentity",name: "jenkins", email: "jenkins@jenkins"] | ||
| ] | ||
| ]) | ||
| } | ||
| sh """ | ||
| git submodule update --init iMEGA/Vendor/SVProgressHUD | ||
| git submodule update --init iMEGA/Vendor/LTHPasscodeViewController | ||
| """ | ||
| script{ | ||
| ios_sources_workspace = WORKSPACE | ||
| sdk_sources_workspace = "${ios_sources_workspace}/Modules/DataSource/MEGASDK/Sources/MEGASDK" | ||
| megachat_sources_workspace = "${ios_sources_workspace}/Modules/DataSource/MEGAChatSDK/Sources/MEGAChatSDK" | ||
| } | ||
| } | ||
| } | ||
| stage('Build MEGACHAT SDK and iOS'){ | ||
| environment{ | ||
| PATH = "/usr/local/bin:${env.PATH}" | ||
| LIBTOOLIZE = "/usr/local/bin/glibtoolize" | ||
| } | ||
| steps{ | ||
| sh """ | ||
| bundle config set --local path 'vendor/bundle' | ||
| bundle install | ||
| """ | ||
| dir("${megachat_sources_workspace}/src"){ | ||
| sh """ | ||
| cmake -P genDbSchema.cmake | ||
| """ | ||
| } | ||
| sh """ | ||
| bundle exec fastlane configure_sdk_and_chat_library use_cache:true | ||
| """ | ||
| withCredentials([gitUsernamePassword(credentialsId: 'jenkins_sdk_token_with_user', gitToolName: 'Default')]) { | ||
| sh """ | ||
| bundle exec fastlane update_plugins | ||
| bundle exec fastlane build_simulator | ||
| """ | ||
| } | ||
| } | ||
| } | ||
| } | ||
| post { | ||
| always { | ||
| deleteDir() | ||
| } | ||
| } | ||
| } | ||
| // vim: syntax=groovy tabstop=4 shiftwidth=4 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
69 changes: 69 additions & 0 deletions
69
jenkinsfile/specific_branches/MEGAChat_macos_develop.groovy
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| pipeline { | ||
| agent { label 'osx && arm64' } | ||
| options { | ||
| buildDiscarder(logRotator(numToKeepStr: '135', daysToKeepStr: '21')) | ||
| gitLabConnection('GitLabConnectionJenkins') | ||
| ansiColor('xterm') | ||
| } | ||
| environment { | ||
| PATH = "/usr/local/bin:${env.PATH}" | ||
| VCPKGPATH = "${env.HOME}/jenkins/vcpkg" | ||
| MEGAQTPATH= "${env.HOME}/Qt-build/5.15.13/5.15.13/arm64" | ||
| BUILD_TYPE= "Release" | ||
| APIURL_TO_TEST = "https://g.api.mega.co.nz/" | ||
| SDK_BRANCH = "develop" | ||
| MEGACHAT_BRANCH = "develop" | ||
| BUILD_OPTIONS = ' ' | ||
| BUILD_DIR = "build_dir" | ||
| BUILD_DIR_X64 = "build_dir_x64" | ||
| } | ||
| stages { | ||
| stage('Checkout SDK and MEGAchat'){ | ||
| steps { | ||
| checkout([ | ||
| $class: 'GitSCM', | ||
| branches: [[name: "origin/${env.MEGACHAT_BRANCH}"]], | ||
| userRemoteConfigs: [[ url: "${env.GIT_URL_MEGACHAT}", credentialsId: "12492eb8-0278-4402-98f0-4412abfb65c1" ]], | ||
| ]) | ||
| dir('third-party/mega'){ | ||
| sh "echo Cloning SDK branch ${SDK_BRANCH}" | ||
| checkout([ | ||
| $class: 'GitSCM', | ||
| branches: [[name: "origin/${SDK_BRANCH}"]], | ||
| userRemoteConfigs: [[ url: "${env.GIT_URL_SDK}", credentialsId: "12492eb8-0278-4402-98f0-4412abfb65c1" ]], | ||
| ]) | ||
| } | ||
| script{ | ||
| megachat_sources_workspace = WORKSPACE | ||
| } | ||
| } | ||
| } | ||
| stage('Build MEGAchat'){ | ||
| steps{ | ||
| dir(megachat_sources_workspace){ | ||
| //Build for arm64 | ||
| sh "echo Building for arm64 in ${BUILD_TYPE} mode" | ||
| sh "mkdir ${BUILD_DIR}" | ||
| sh "cmake -DENABLE_CHATLIB_WERROR=ON -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DVCPKG_ROOT=${VCPKGPATH} ${BUILD_OPTIONS} -DCMAKE_VERBOSE_MAKEFILE=ON \ | ||
| -S ${megachat_sources_workspace} -B ${megachat_sources_workspace}/${BUILD_DIR} -DCMAKE_PREFIX_PATH=${MEGAQTPATH} \ | ||
| -DCMAKE_OSX_ARCHITECTURES=arm64 -DENABLE_CHATLIB_QTAPP=OFF -DENABLE_CHATLIB_TESTS=ON -DUSE_FFMPEG=OFF -DUSE_FREEIMAGE=OFF" | ||
| sh "cmake --build ${megachat_sources_workspace}/${BUILD_DIR} -j3" | ||
|
|
||
| //build for x64 | ||
| sh "echo Building for x64-crosscompiling in ${BUILD_TYPE} mode" | ||
| sh "mkdir ${BUILD_DIR_X64}" | ||
| sh "cmake -DENABLE_CHATLIB_WERROR=ON -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DVCPKG_ROOT=${VCPKGPATH} ${BUILD_OPTIONS} -DCMAKE_VERBOSE_MAKEFILE=ON \ | ||
| -DCMAKE_OSX_ARCHITECTURES=x86_64 -DENABLE_CHATLIB_QTAPP=OFF -DENABLE_CHATLIB_TESTS=ON -DUSE_FFMPEG=OFF -DUSE_FREEIMAGE=OFF \ | ||
| -S ${megachat_sources_workspace} -B ${megachat_sources_workspace}/${BUILD_DIR_X64} -DCMAKE_PREFIX_PATH=${MEGAQTPATH}" | ||
| sh "cmake --build ${megachat_sources_workspace}/${BUILD_DIR_X64} -j3" | ||
| } | ||
| } | ||
| } | ||
| } | ||
| post { | ||
| always { | ||
| deleteDir() | ||
| } | ||
| } | ||
| } | ||
| // vim: syntax=groovy tabstop=4 shiftwidth=4 |
Oops, something went wrong.