Skip to content

Commit 88ee156

Browse files
DagefoerdeDagefoerde
authored
Merge pull request #53 from justusdieckmann/travis/moodle39
New release v3.9-r1 tested against Moodle 3.9 (and below)
2 parents a7567a3 + 781424e commit 88ee156

File tree

8 files changed

+59
-73
lines changed

8 files changed

+59
-73
lines changed

‎.travis.yml‎

Lines changed: 50 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,102 +1,86 @@
11
language: php
2-
3-
sudo: false
4-
dist: trusty
2+
os: linux
3+
dist: xenial
54

65
addons:
76
firefox: "47.0.1"
8-
postgresql: "9.4"
9-
apt:
10-
packages:
11-
- oracle-java9-installer
12-
- oracle-java9-set-default
7+
postgresql: "9.5"
8+
9+
services: mysql
1310

1411
cache:
1512
directories:
1613
- $HOME/.composer/cache
1714
- $HOME/.npm
1815

1916
php:
20-
- 7.0
21-
- 7.1
22-
- 7.3
23-
24-
matrix:
25-
exclude:
26-
- php: 7.0
27-
env: DB=pgsql MOODLE_BRANCH=master
28-
- php: 7.0
29-
env: DB=mysqli MOODLE_BRANCH=master
30-
- php: 7.0
31-
env: DB=pgsql MOODLE_BRANCH=MOODLE_37_STABLE
32-
- php: 7.0
33-
env: DB=mysqli MOODLE_BRANCH=MOODLE_37_STABLE
34-
- php: 7.0
35-
env: DB=pgsql MOODLE_BRANCH=MOODLE_38_STABLE
36-
- php: 7.0
37-
env: DB=mysqli MOODLE_BRANCH=MOODLE_38_STABLE
38-
- php: 7.3
39-
env: DB=pgsql MOODLE_BRANCH=MOODLE_35_STABLE
40-
- php: 7.3
41-
env: DB=mysqli MOODLE_BRANCH=MOODLE_35_STABLE
42-
fast_finish: true
17+
- 7.2
18+
- 7.3
19+
- 7.4
4320

4421
env:
45-
global:
46-
- BEHAT=yes
47-
- MUSTACHE_IGNORE_NAMES="email_html_body.mustache, email_html.mustache, email_text.mustache"
48-
matrix:
49-
- DB=pgsql MOODLE_BRANCH=MOODLE_35_STABLE
50-
- DB=pgsql MOODLE_BRANCH=MOODLE_36_STABLE
51-
- DB=pgsql MOODLE_BRANCH=MOODLE_37_STABLE
52-
- DB=pgsql MOODLE_BRANCH=MOODLE_38_STABLE
53-
- DB=pgsql MOODLE_BRANCH=master
54-
- DB=mysqli MOODLE_BRANCH=MOODLE_35_STABLE
55-
- DB=mysqli MOODLE_BRANCH=MOODLE_36_STABLE
56-
- DB=mysqli MOODLE_BRANCH=MOODLE_37_STABLE
57-
- DB=mysqli MOODLE_BRANCH=MOODLE_38_STABLE
58-
- DB=mysqli MOODLE_BRANCH=master
22+
global:
23+
- BEHAT=yes
24+
- MUSTACHE_IGNORE_NAMES="email_html_body.mustache, email_html.mustache, email_text.mustache"
25+
jobs:
26+
- DB=pgsql MOODLE_BRANCH=MOODLE_35_STABLE
27+
- DB=pgsql MOODLE_BRANCH=MOODLE_37_STABLE
28+
- DB=pgsql MOODLE_BRANCH=MOODLE_38_STABLE
29+
- DB=pgsql MOODLE_BRANCH=MOODLE_39_STABLE
30+
- DB=pgsql MOODLE_BRANCH=master
31+
- DB=mysqli MOODLE_BRANCH=MOODLE_35_STABLE
32+
- DB=mysqli MOODLE_BRANCH=MOODLE_37_STABLE
33+
- DB=mysqli MOODLE_BRANCH=MOODLE_38_STABLE
34+
- DB=mysqli MOODLE_BRANCH=MOODLE_39_STABLE
35+
- DB=mysqli MOODLE_BRANCH=master
5936

6037
before_install:
6138
- phpenv config-rm xdebug.ini
62-
- nvm install v8.9.4
39+
- nvm install v14
6340
- cd ../..
6441
- composer selfupdate
65-
- composer create-project -n --no-dev --prefer-dist moodlerooms/moodle-plugin-ci ci ^2
42+
- composer create-project -n --no-dev --prefer-dist blackboard-open-source/moodle-plugin-ci ci dev-master
6643
- export PATH="$(cd ci/bin; pwd):$(cd ci/vendor/bin; pwd):$PATH"
6744

6845
jobs:
46+
fast_finish: true
6947
include:
7048
# Prechecks against latest Moodle stable only.
7149
- stage: static
72-
php: 7.3
73-
env: DB=mysqli MOODLE_BRANCH=MOODLE_37_STABLE
50+
php: 7.4
51+
env: DB=mysqli MOODLE_BRANCH=MOODLE_39_STABLE
7452
install:
75-
- moodle-plugin-ci install --no-init
53+
- moodle-plugin-ci install --no-init
7654
script:
77-
- moodle-plugin-ci phplint
78-
- moodle-plugin-ci phpcpd
79-
- moodle-plugin-ci phpmd
80-
- moodle-plugin-ci codechecker
81-
- moodle-plugin-ci validate
82-
- moodle-plugin-ci savepoints
83-
- moodle-plugin-ci mustache
84-
- moodle-plugin-ci grunt || [ "$MOODLE_BRANCH" = 'master' ]
85-
55+
- moodle-plugin-ci phplint
56+
- moodle-plugin-ci phpcpd
57+
- moodle-plugin-ci phpmd
58+
- moodle-plugin-ci codechecker
59+
- moodle-plugin-ci validate
60+
- moodle-plugin-ci savepoints
61+
- moodle-plugin-ci mustache
62+
- moodle-plugin-ci grunt
8663
# Smaller build matrix for development builds
8764
- stage: develop
88-
php: 7.3
65+
php: 7.4
66+
env: DB=mysqli MOODLE_BRANCH=MOODLE_39_STABLE
67+
exclude:
68+
- php: 7.3
69+
env: DB=pgsql MOODLE_BRANCH=MOODLE_35_STABLE
70+
- php: 7.3
71+
env: DB=mysqli MOODLE_BRANCH=MOODLE_35_STABLE
72+
- php: 7.4
73+
env: DB=pgsql MOODLE_BRANCH=MOODLE_35_STABLE
74+
- php: 7.4
75+
env: DB=mysqli MOODLE_BRANCH=MOODLE_35_STABLE
76+
- php: 7.4
77+
env: DB=pgsql MOODLE_BRANCH=MOODLE_37_STABLE
78+
- php: 7.4
8979
env: DB=mysqli MOODLE_BRANCH=MOODLE_37_STABLE
90-
install:
91-
- moodle-plugin-ci install
92-
script:
93-
- moodle-plugin-ci phpunit --coverage-clover
94-
- moodle-plugin-ci behat
9580

9681
# Default 'test' stage: Unit tests and behat tests against full matrix.
9782
install:
9883
- moodle-plugin-ci install
99-
10084
script:
10185
- moodle-plugin-ci phpunit --coverage-clover
10286
- moodle-plugin-ci behat

‎amd/build/functions.min.js‎

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎amd/build/functions.min.js.map‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎post.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -495,7 +495,7 @@
495495
$post->message .= '<p><span class="edited">(' . get_string('editedby', 'moodleoverflow', $data) . ')</span></p>';
496496
} else {
497497
$data->name = fullname($USER);
498-
$post->message .= "\n\n(" . get_string('editedby', 'moodleoverflow', $data) - ')';
498+
$post->message .= "\n\n(" . get_string('editedby', 'moodleoverflow', $data) . ')';
499499
}
500500

501501
// Delete the temporary object.

‎tests/behat/add_moodleoverflow.feature‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@ Feature: Add moodleoverflow activities and discussions
2525
And I add a new discussion to "Test moodleoverflow name" moodleoverflow with:
2626
| Subject | Forum post 1 |
2727
| Message | This is the body |
28-
And I log out
28+
And I log out

‎tests/behat/edit_post_student.feature‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,4 @@ Feature: Students can edit or delete their moodleoverflow posts within a set tim
3838
Given I follow "Moodleoverflow post subject"
3939
When I follow "Delete"
4040
And I press "Continue"
41-
Then I should not see "Moodleoverflow post subject"
41+
Then I should not see "Moodleoverflow post subject"

‎tests/behat/moodleoverflow_subscriptions.feature‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,4 +70,4 @@ Feature: A user can control their own subscription preferences for a moodleoverf
7070
And I follow "Subscribe to this forum"
7171
And I should see "Student One will be notified of new posts in 'Test moodleoverflow name'"
7272
And I should see "Unsubscribe from this forum"
73-
And I should not see "Subscribe to this forum"
73+
And I should not see "Subscribe to this forum"

‎version.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
defined('MOODLE_INTERNAL') || die();
2929

3030
$plugin->component = 'mod_moodleoverflow';
31-
$plugin->version = 2019112100;
32-
$plugin->release = 'v3.8-r1';
31+
$plugin->version = 2020060500;
32+
$plugin->release = 'v3.9-r1';
3333
$plugin->requires = 2018051703;
3434
$plugin->maturity = MATURITY_STABLE;
3535
$plugin->dependencies = array();

0 commit comments

Comments
 (0)