Skip to content

Commit 2c82790

Browse files
authored
Merge pull request #2429 from moodlehq/integration
Integration
2 parents d1f1c6d + 1628ccd commit 2c82790

File tree

389 files changed

+18292
-5960
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

389 files changed

+18292
-5960
lines changed

.gitignore

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,13 @@ platforms/
2626
/plugins/
2727
/plugins/android.json
2828
/plugins/ios.json
29+
resources/android/icon
30+
resources/android/splash
31+
resources/ios/icon
32+
resources/ios/splash
33+
resources/windows/icon
34+
resources/windows/splash
35+
config.xml
2936
www/
3037
!www/README.md
3138
$RECYCLE.BIN/

.npmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
engine-strict=true

.travis.yml

Lines changed: 107 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,125 @@
11
os: linux
22
dist: bionic
33
group: edge
4-
54
language: node_js
65
node_js: 11
6+
php: 7.1
7+
8+
android:
9+
components:
10+
- tools
11+
- platform-tools
12+
- build-tools-29.0.3
13+
- android-28
14+
- extra-google-google_play_services
15+
- extra-google-m2repository
16+
- extra-android-m2repository
17+
18+
git:
19+
depth: 3
720

821
before_cache:
922
- rm -rf $HOME/.cache/electron-builder/wine
23+
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
24+
- rm -fr $HOME/.gradle/caches/*/plugin-resolution/
1025

1126
cache:
1227
directories:
1328
- $HOME/.npm
1429
- $HOME/.cache/electron
1530
- $HOME/.cache/electron-builder
31+
- $HOME/.gradle/caches/
32+
- $HOME/.gradle/wrapper/
33+
- $HOME/.android/build-cache
1634

1735
before_script:
18-
- npm install npm@latest -g
36+
- if [ "$TRAVIS_OS_NAME" != 'windows' ] ; then npm install npm@latest -g ; fi
1937
- gulp
2038

21-
script:
22-
- npm run build --bailOnLintError true --typeCheckOnLint true
23-
24-
after_success:
25-
- scripts/ci.sh
39+
jobs:
40+
include:
41+
- stage: check
42+
if: NOT branch =~ /(master|integration|desktop)$/ AND env(DEPLOY) IS blank
43+
os: linux
44+
script: npm run build --bailOnLintError true --typeCheckOnLint true
45+
- stage: mirror
46+
if: branch IN (master, integration, desktop) AND repo = moodlehq/moodleapp AND type != cron
47+
os: linux
48+
script: scripts/mirror.sh
49+
- stage: prepare
50+
if: branch =~ /(master|^integration)$/ AND env(PREPARE) IS NOT blank AND env(PREPARE) = 1 AND type != cron
51+
os: linux
52+
script: scripts/aot.sh
53+
- stage: build
54+
name: "Build Android"
55+
if: env(DEPLOY) IS NOT blank AND ((env(DEPLOY) = 1 AND NOT branch = desktop) OR (env(DEPLOY) IN (2,3) AND tag IS NOT blank))
56+
os: linux
57+
dist: trusty
58+
group: edge
59+
language: android
60+
env:
61+
- BUILD_PLATFORM='android'
62+
before_install:
63+
- nvm install 11
64+
- node --version
65+
- npm --version
66+
- nvm --version
67+
- npm ci
68+
- npm install -g gulp
69+
script: scripts/aot.sh
70+
- stage: build
71+
name: "Build iOS"
72+
if: env(DEPLOY) IS NOT blank AND ((env(DEPLOY) = 1 AND NOT branch = desktop) OR (env(DEPLOY) IN (2,3) AND tag IS NOT blank))
73+
os: osx
74+
osx_image: xcode11.3
75+
env:
76+
- BUILD_PLATFORM='ios'
77+
script: scripts/aot.sh
78+
- stage: build
79+
name: "Build Linux"
80+
if: env(DEPLOY) IS NOT blank AND ((env(DEPLOY) = 1 AND branch = desktop) OR (env(DEPLOY) = 3 AND tag IS NOT blank))
81+
os: linux
82+
env:
83+
- ELECTRON_CACHE=$HOME/.cache/electron
84+
- ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder
85+
- BUILD_PLATFORM='linux'
86+
script: scripts/aot.sh
87+
- stage: build
88+
name: "Build MacOS"
89+
if: env(DEPLOY) IS NOT blank AND ((env(DEPLOY) = 1 AND branch = desktop) OR (env(DEPLOY) = 3 AND tag IS NOT blank))
90+
os: osx
91+
osx_image: xcode11.3
92+
env:
93+
- ELECTRON_CACHE=$HOME/.cache/electron
94+
- ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder
95+
- BUILD_PLATFORM='osx'
96+
script: scripts/aot.sh
97+
- stage: build
98+
name: "Build Windows"
99+
if: env(DEPLOY) IS NOT blank AND ((env(DEPLOY) = 1 AND branch = desktop) OR (env(DEPLOY) = 3 AND tag IS NOT blank))
100+
os: windows
101+
env:
102+
- ELECTRON_CACHE=$HOME/.cache/electron
103+
- ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder
104+
- ELECTRON_BUILDER_ALLOW_UNRESOLVED_DEPENDENCIES=true
105+
- DEBUG=electron-windows-store
106+
- BUILD_PLATFORM='windows'
107+
script: scripts/aot.sh
108+
- stage: test
109+
name: "End to end tests (mod_forum, mod_messages and mod_comments)"
110+
services:
111+
- docker
112+
if: type = cron
113+
script: scripts/test_e2e.sh "@app&&@mod_forum" "@app&&@mod_messages" "@app&&@mod_comments"
114+
- stage: test
115+
name: "End to end tests (mod_data, mod_survey, mod_course, core_course and mod_courses)"
116+
services:
117+
- docker
118+
if: type = cron
119+
script: scripts/test_e2e.sh "@app&&@mod_data" "@app&&@mod_survey" "@app&&@mod_course" "@app&&@core_course" "@app&&@mod_courses"
120+
- stage: test
121+
name: "End to end tests (others)"
122+
services:
123+
- docker
124+
if: type = cron
125+
script: scripts/test_e2e.sh "@app&&~@mod_forum&&~@mod_messages&&~@mod_comments&&~@mod_data&&~@mod_survey&&~@mod_course&&~@core_course&&~@mod_courses"

0 commit comments

Comments
 (0)