Skip to content

Commit 6a68974

Browse files
committed
Tidy up and remove references to legacy CI_PLUGIN versions.
1 parent f166b8f commit 6a68974

File tree

1 file changed

+37
-49
lines changed

1 file changed

+37
-49
lines changed

.travis.yml

+37-49
Original file line numberDiff line numberDiff line change
@@ -20,73 +20,73 @@ services:
2020
matrix:
2121
include:
2222
- php: 7.0
23-
env: DB=mysqli MOODLE_BRANCH=MOODLE_35_STABLE CI_PLUGIN=3
23+
env: DB=mysqli MOODLE_BRANCH=MOODLE_35_STABLE
2424
- php: 7.0
25-
env: DB=pgsql MOODLE_BRANCH=MOODLE_35_STABLE CI_PLUGIN=3
25+
env: DB=pgsql MOODLE_BRANCH=MOODLE_35_STABLE
2626
- php: 7.1
27-
env: DB=mysqli MOODLE_BRANCH=MOODLE_35_STABLE CI_PLUGIN=3
27+
env: DB=mysqli MOODLE_BRANCH=MOODLE_35_STABLE
2828
- php: 7.1
29-
env: DB=pgsql MOODLE_BRANCH=MOODLE_35_STABLE CI_PLUGIN=3
29+
env: DB=pgsql MOODLE_BRANCH=MOODLE_35_STABLE
3030
- php: 7.1
31-
env: DB=mysqli MOODLE_BRANCH=MOODLE_37_STABLE CI_PLUGIN=3
31+
env: DB=mysqli MOODLE_BRANCH=MOODLE_37_STABLE
3232
- php: 7.1
33-
env: DB=pgsql MOODLE_BRANCH=MOODLE_37_STABLE CI_PLUGIN=3
33+
env: DB=pgsql MOODLE_BRANCH=MOODLE_37_STABLE
3434
- php: 7.1
35-
env: DB=mysqli MOODLE_BRANCH=MOODLE_38_STABLE CI_PLUGIN=3
35+
env: DB=mysqli MOODLE_BRANCH=MOODLE_38_STABLE
3636
- php: 7.1
37-
env: DB=pgsql MOODLE_BRANCH=MOODLE_38_STABLE CI_PLUGIN=3
37+
env: DB=pgsql MOODLE_BRANCH=MOODLE_38_STABLE
3838
- php: 7.2
39-
env: DB=mysqli MOODLE_BRANCH=MOODLE_35_STABLE CI_PLUGIN=3
39+
env: DB=mysqli MOODLE_BRANCH=MOODLE_35_STABLE
4040
- php: 7.2
41-
env: DB=pgsql MOODLE_BRANCH=MOODLE_35_STABLE CI_PLUGIN=3
41+
env: DB=pgsql MOODLE_BRANCH=MOODLE_35_STABLE
4242
- php: 7.2
43-
env: DB=mysqli MOODLE_BRANCH=MOODLE_36_STABLE CI_PLUGIN=3
43+
env: DB=mysqli MOODLE_BRANCH=MOODLE_36_STABLE
4444
- php: 7.2
45-
env: DB=pgsql MOODLE_BRANCH=MOODLE_36_STABLE CI_PLUGIN=3
45+
env: DB=pgsql MOODLE_BRANCH=MOODLE_36_STABLE
4646
- php: 7.2
47-
env: DB=pgsql MOODLE_BRANCH=MOODLE_37_STABLE CI_PLUGIN=3
47+
env: DB=pgsql MOODLE_BRANCH=MOODLE_37_STABLE
4848
- php: 7.2
49-
env: DB=mysqli MOODLE_BRANCH=MOODLE_37_STABLE CI_PLUGIN=3
49+
env: DB=mysqli MOODLE_BRANCH=MOODLE_37_STABLE
5050
- php: 7.2
51-
env: DB=pgsql MOODLE_BRANCH=MOODLE_38_STABLE CI_PLUGIN=3
51+
env: DB=pgsql MOODLE_BRANCH=MOODLE_38_STABLE
5252
- php: 7.2
53-
env: DB=mysqli MOODLE_BRANCH=MOODLE_38_STABLE CI_PLUGIN=3
53+
env: DB=mysqli MOODLE_BRANCH=MOODLE_38_STABLE
5454
- php: 7.2
55-
env: DB=pgsql MOODLE_BRANCH=MOODLE_39_STABLE CI_PLUGIN=3
55+
env: DB=pgsql MOODLE_BRANCH=MOODLE_39_STABLE
5656
- php: 7.2
57-
env: DB=mysqli MOODLE_BRANCH=MOODLE_39_STABLE CI_PLUGIN=3
57+
env: DB=mysqli MOODLE_BRANCH=MOODLE_39_STABLE
5858
- php: 7.2
59-
env: DB=pgsql MOODLE_BRANCH=master CI_PLUGIN=3
59+
env: DB=pgsql MOODLE_BRANCH=master
6060
- php: 7.2
61-
env: DB=mysqli MOODLE_BRANCH=master CI_PLUGIN=3
61+
env: DB=mysqli MOODLE_BRANCH=master
6262
- php: 7.3
63-
env: DB=pgsql MOODLE_BRANCH=MOODLE_37_STABLE CI_PLUGIN=3
63+
env: DB=pgsql MOODLE_BRANCH=MOODLE_37_STABLE
6464
- php: 7.3
65-
env: DB=mysqli MOODLE_BRANCH=MOODLE_37_STABLE CI_PLUGIN=3
65+
env: DB=mysqli MOODLE_BRANCH=MOODLE_37_STABLE
6666
- php: 7.3
67-
env: DB=mysqli MOODLE_BRANCH=MOODLE_38_STABLE CI_PLUGIN=3
67+
env: DB=mysqli MOODLE_BRANCH=MOODLE_38_STABLE
6868
- php: 7.3
69-
env: DB=pgsql MOODLE_BRANCH=MOODLE_38_STABLE CI_PLUGIN=3
69+
env: DB=pgsql MOODLE_BRANCH=MOODLE_38_STABLE
7070
- php: 7.3
71-
env: DB=mysqli MOODLE_BRANCH=MOODLE_39_STABLE CI_PLUGIN=3
71+
env: DB=mysqli MOODLE_BRANCH=MOODLE_39_STABLE
7272
- php: 7.3
73-
env: DB=pgsql MOODLE_BRANCH=MOODLE_39_STABLE CI_PLUGIN=3
73+
env: DB=pgsql MOODLE_BRANCH=MOODLE_39_STABLE
7474
- php: 7.3
75-
env: DB=pgsql MOODLE_BRANCH=master CI_PLUGIN=3
75+
env: DB=pgsql MOODLE_BRANCH=master
7676
- php: 7.3
77-
env: DB=mysqli MOODLE_BRANCH=master CI_PLUGIN=3
77+
env: DB=mysqli MOODLE_BRANCH=master
7878
- php: 7.4
79-
env: DB=mysqli MOODLE_BRANCH=MOODLE_38_STABLE CI_PLUGIN=3
79+
env: DB=mysqli MOODLE_BRANCH=MOODLE_38_STABLE
8080
- php: 7.4
81-
env: DB=pgsql MOODLE_BRANCH=MOODLE_38_STABLE CI_PLUGIN=3
81+
env: DB=pgsql MOODLE_BRANCH=MOODLE_38_STABLE
8282
- php: 7.4
83-
env: DB=pgsql MOODLE_BRANCH=MOODLE_39_STABLE CI_PLUGIN=3
83+
env: DB=pgsql MOODLE_BRANCH=MOODLE_39_STABLE
8484
- php: 7.4
85-
env: DB=mysqli MOODLE_BRANCH=MOODLE_39_STABLE CI_PLUGIN=3
85+
env: DB=mysqli MOODLE_BRANCH=MOODLE_39_STABLE
8686
- php: 7.4
87-
env: DB=pgsql MOODLE_BRANCH=master CI_PLUGIN=3
87+
env: DB=pgsql MOODLE_BRANCH=master
8888
- php: 7.4
89-
env: DB=mysqli MOODLE_BRANCH=master CI_PLUGIN=3
89+
env: DB=mysqli MOODLE_BRANCH=master
9090

9191
before_install:
9292
- sudo hostname short-hostname
@@ -96,13 +96,7 @@ before_install:
9696
- if [ "$MOODLE_VERSION" = 36 ] || [ "$MOODLE_VERSION" -le 34 ]; then NVMVERSION=8.9; else NVMVERSION=14.0.0; fi
9797
- nvm install $NVMVERSION;
9898
- nvm use $NVMVERSION;
99-
- if [ "$CI_PLUGIN" = 3 ]; then
100-
composer create-project -n --no-dev --prefer-dist moodlehq/moodle-plugin-ci ci ^3;
101-
elif [ "$CI_PLUGIN" = 2 ]; then
102-
composer create-project -n --no-dev --prefer-dist moodlerooms/moodle-plugin-ci ci ^2;
103-
else
104-
composer create-project -n --no-dev --prefer-dist moodlerooms/moodle-plugin-ci ci ^1;
105-
fi
99+
- composer create-project -n --no-dev --prefer-dist moodlehq/moodle-plugin-ci ci ^3;
106100
- export PATH="$(cd ci/bin; pwd):$(cd ci/vendor/bin; pwd):$PATH"
107101

108102
install:
@@ -114,13 +108,7 @@ script:
114108
- moodle-plugin-ci phpmd
115109
- moodle-plugin-ci codechecker
116110
- moodle-plugin-ci validate
117-
- if [ "$CI_PLUGIN" = 3 ] || [ "$CI_PLUGIN" = 2 ]; then
118-
moodle-plugin-ci savepoints || travis_terminate 1;
119-
moodle-plugin-ci grunt || travis_terminate 1;
120-
else
121-
moodle-plugin-ci csslint || travis_terminate 1;
122-
moodle-plugin-ci jshint || travis_terminate 1;
123-
moodle-plugin-ci shifter || travis_terminate 1;
124-
fi
111+
- moodle-plugin-ci savepoints || travis_terminate 1;
112+
- moodle-plugin-ci grunt || travis_terminate 1;
125113
- moodle-plugin-ci phpunit
126114
- moodle-plugin-ci behat

0 commit comments

Comments
 (0)