toki/mattermost-mobile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bump Android build number to 75 (#1337)

Browse source
This commit is contained in:
enahum 2018-01-04 18:35:39 -03:00 committed by GitHub
parent d776baf29a
commit 3c309da69d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/app/build.gradle
View file

@ -106,7 +106,7 @@ android {
applicationId "com.mattermost.rnbeta"
minSdkVersion 21
targetSdkVersion 23
versionCode 74
versionCode 75
versionName "1.6.0"
multiDexEnabled true
ndk {

7
fastlane/Fastfile
View file

@ -508,18 +508,19 @@ def configure_from_env
end
def git_actions
if ENV['COMMIT_CHANGES_TO_GIT'] == 'true' && ENV['GIT_BRANCH'] != 'master'
if ENV['COMMIT_CHANGES_TO_GIT'] == 'true' && !ENV['GIT_LOCAL_BRANCH'].nil? && !ENV['GIT_LOCAL_BRANCH'].empty? && ENV['GIT_LOCAL_BRANCH'] != 'master'
commit_message = last_git_commit[:message]
push_to_git_remote(
remote: ENV['GIT_REMOTE'] || 'origin',
local_branch: ENV['GIT_BRANCH'],
remote_branch: ENV['GIT_REMOTE_BRANCH'] || ENV['GIT_BRANCH'],
local_branch: ENV['GIT_LOCAL_BRANCH'],
remote_branch: ENV['GIT_REMOTE_BRANCH'] || ENV['GIT_LOCAL_BRANCH'],
force: false,
tags: false
)
unless ENV['GITHUB_PULL_REQUEST_API_TOKEN'].nil? || ENV['GITHUB_PULL_REQUEST_API_TOKEN'].empty?
create_pull_request(
head: ENV['GIT_REMOTE_BRANCH'] || ENV['GIT_LOCAL_BRANCH'],
repo: ENV['GITHUB_PULL_REQUEST_REPO'] || 'mattermost/mattermost-mobile',
title: commit_message
)