Skip to content

Commit f699dd1

Browse files
committed
Update moodlehq/moodle-local_ci to fix mustache linting
1 parent 3df003d commit f699dd1

File tree

7 files changed

+12
-16
lines changed

7 files changed

+12
-16
lines changed

.travis.dist.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ sudo: true
55
addons:
66
firefox: "47.0.1"
77
postgresql: "9.4"
8-
apt:
9-
packages:
10-
- openjdk-8-jre-headless
118

129
services:
1310
- mysql

.travis.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ addons:
88
postgresql: "9.4"
99
apt:
1010
packages:
11-
- openjdk-8-jre-headless
1211
- chromium-chromedriver
1312

1413
services:
@@ -84,7 +83,6 @@ jobs:
8483
mariadb: 10.2
8584
apt:
8685
packages:
87-
- openjdk-8-jre-headless
8886
- chromium-chromedriver
8987
- php: 5.6
9088
env: MOODLE_BRANCH=MOODLE_32_STABLE DB=mysqli PROFILE=default

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@
4141
"type": "package",
4242
"package": {
4343
"name": "moodlehq/moodle-local_ci",
44-
"version": "1.0.3",
44+
"version": "1.0.4",
4545
"source": {
4646
"url": "https://github.com/moodlehq/moodle-local_ci.git",
4747
"type": "git",
48-
"reference": "ea72c5f7c937014c1401a833e697afb3d95af7be"
48+
"reference": "3c8a4e7ed8dd14732ff21070dd8baab48c87fb0b"
4949
}
5050
}
5151
},

composer.lock

Lines changed: 4 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ The format of this change log follows the advice given at [Keep a CHANGELOG](htt
1111
## [Unreleased]
1212
## Changed
1313
- Updated [.travis.dist.yml] with a new `services` section to ensure databases start.
14+
- Updated [.travis.dist.yml] to remove `openjdk-8-jre-headless`. See
15+
[#91](https://github.com/blackboard-open-source/moodle-plugin-ci/issues/91).
16+
- Updated verion of `moodlehq/moodle-local_ci` to fix Mustache linting. See
17+
[#91](https://github.com/blackboard-open-source/moodle-plugin-ci/issues/91).
1418

1519
### Added
1620
- New help document: [CLI commands and options](CLI.md)

docs/TravisFileExplained.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,10 @@ language: php
1616
sudo: true
1717

1818
# Installs the required version of Firefox for Behat, an updated version
19-
# of PostgreSQL and extra APT packages. Java 8 is only required
20-
# for Mustache command.
19+
# of PostgreSQL and extra APT packages.
2120
addons:
2221
firefox: "47.0.1"
2322
postgresql: "9.4"
24-
apt:
25-
packages:
26-
- openjdk-8-jre-headless
2723

2824
# Ensure DB services are running.
2925
services:

tests/FileUpdatesTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class FileUpdatesTest extends \PHPUnit_Framework_TestCase
1717
public function testLocalCIPackageJSON()
1818
{
1919
$this->assertSame(
20-
'a9a38e585d04bf9ca45bf970a70c41303c731a02',
20+
'060fde69ff2cc75b70fe560c998735b80e2e0942',
2121
sha1_file(__DIR__.'/../vendor/moodlehq/moodle-local_ci/package.json'),
2222
'Check changes to vendor/moodlehq/moodle-local_ci/package.json and update MustacheCommand, etc if necessary'
2323
);

0 commit comments

Comments
 (0)