Merge pull request #2357 from crazyserver/MOBILE-3401

MOBILE-3401 travis: Add dev on integration does not work
main
Juan Leyva 2020-05-04 10:20:44 +02:00 committed by GitHub
commit 636906e522
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 19 deletions

View File

@ -62,24 +62,6 @@ if [ "$TRAVIS_BRANCH" == 'master' ]; then
git push origin HEAD:$TRAVIS_BRANCH
fi
VERSION=`jq -r '.versionname' src/config.json`
if [ "$TRAVIS_BRANCH" == 'integration' ] && [ "$VERSION" != *-dev ] ; then
VERSION=$VERSION-dev
jq -r --indent 4 --arg version "$VERSION" -s '.[0] + {versionname: $version}' src/config.json > src/config_new.json
mv src/config_new.json src/config.json
sed -ie "s/version[ ]*=[ ]*\"[0-9\.]*\">/version=\"$VERSION\">/1" config.xml
git remote set-url origin https://$GIT_TOKEN@github.com/$TRAVIS_REPO_SLUG.git
git fetch -q origin
git add src/config.json
git commit -m 'Change config version [ci skip]'
git push origin HEAD:$TRAVIS_BRANCH
fi
if [ "$TRAVIS_BRANCH" == 'integration' ] || [ "$TRAVIS_BRANCH" == 'master' ] || [ "$TRAVIS_BRANCH" == 'desktop' ] ; then
print_title "Mirror repository"
git remote add mirror https://$GIT_TOKEN@github.com/$GIT_ORG_PRIVATE/moodleapp.git

View File

@ -3,7 +3,7 @@
"appname": "Moodle Mobile",
"desktopappname": "Moodle Desktop",
"versioncode": 3820,
"versionname": "3.8.2-dev-dev",
"versionname": "3.8.2-dev",
"cache_update_frequency_usually": 420000,
"cache_update_frequency_often": 1200000,
"cache_update_frequency_sometimes": 3600000,