diff --git a/.gitignore b/.gitignore index de9eaa33e..be5a2b54d 100644 --- a/.gitignore +++ b/.gitignore @@ -26,6 +26,13 @@ platforms/ /plugins/ /plugins/android.json /plugins/ios.json +resources/android/icon +resources/android/splash +resources/ios/icon +resources/ios/splash +resources/windows/icon +resources/windows/splash +config.xml www/ !www/README.md $RECYCLE.BIN/ diff --git a/resources/icon.png b/resources/icon.png index 59ea30d89..7abfc0a4f 100644 Binary files a/resources/icon.png and b/resources/icon.png differ diff --git a/scripts/mirror.sh b/scripts/mirror.sh index bd29e555b..1605b4688 100755 --- a/scripts/mirror.sh +++ b/scripts/mirror.sh @@ -60,12 +60,18 @@ if [ "$TRAVIS_BRANCH" == 'master' ]; then git commit -m 'Update licenses [ci skip]' git push origin HEAD:$TRAVIS_BRANCH + check_success_exit "Unsuccessful push, stopping..." 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 git fetch -q --unshallow mirror + check_success_exit "Unsuccessful fetch, stopping..." + git fetch -q --unshallow origin + check_success_exit "Unsuccessful fetch, stopping..." git push -f mirror HEAD:$TRAVIS_BRANCH + check_success_exit "Unsuccessful mirror, stopping..." git push -f mirror --tags + check_success_exit "Unsuccessful mirror tags, stopping..." fi