Skip to content

Commit cb78c5d

Browse files
authored
Merge pull request #114 from stronk7/moodle_40_reqs
Bump to fulfill 4.0 requirements
2 parents 14e6e82 + 1a6dcab commit cb78c5d

File tree

7 files changed

+13
-7
lines changed

7 files changed

+13
-7
lines changed

.github/workflows/test.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929

3030
services:
3131
postgres:
32-
image: postgres:9.6
32+
image: postgres:10
3333
env:
3434
POSTGRES_USER: 'postgres'
3535
POSTGRES_HOST_AUTH_METHOD: 'trust'
@@ -102,6 +102,7 @@ jobs:
102102
moodle-plugin-ci mustache
103103
moodle-plugin-ci grunt || [ \
104104
"$MOODLE_BRANCH" != 'master' -a \
105+
"$MOODLE_BRANCH" != 'MOODLE_311_STABLE' -a \
105106
"$MOODLE_BRANCH" != 'MOODLE_310_STABLE' -a \
106107
"$MOODLE_BRANCH" != 'MOODLE_39_STABLE' ]
107108
moodle-plugin-ci phpdoc

.travis.dist.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
language: php
22

33
addons:
4-
postgresql: "9.6"
4+
postgresql: "10"
55

66
services:
77
- mysql

.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
language: php
22

33
addons:
4-
postgresql: "9.6"
4+
postgresql: "10"
55

66
services:
77
- mysql
@@ -48,6 +48,7 @@ script:
4848
- moodle-plugin-ci mustache
4949
- moodle-plugin-ci grunt || [ \
5050
"$MOODLE_BRANCH" != 'master' -a \
51+
"$MOODLE_BRANCH" != 'MOODLE_311_STABLE' -a \
5152
"$MOODLE_BRANCH" != 'MOODLE_310_STABLE' -a \
5253
"$MOODLE_BRANCH" != 'MOODLE_39_STABLE' ]
5354
- moodle-plugin-ci phpdoc

docs/CHANGELOG.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,11 @@ This project adheres to [Semantic Versioning](http://semver.org/).
99
The format of this change log follows the advice given at [Keep a CHANGELOG](http://keepachangelog.com).
1010

1111
## [Unreleased]
12-
No unreleased changes.
12+
### Changed
13+
- Updated [gha.dist.yml](https://github.com/moodlehq/moodle-plugin-ci/blob/master/gha.dist.yml) and
14+
[.travis.dist.yml](https://github.com/moodlehq/moodle-plugin-ci/blob/master/.travis.dist.yml)
15+
to use PostgreSQL 10 (Moodle 4.0 new requirement).
16+
- ACTION REQUIRED: Existing integrations running tests with PostgreSQL now need to use version 10 or newer.
1317

1418
## [3.1.0] - 2021-05-14
1519
### Added

docs/GHAFileExplained.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
# DB services you need for testing.
3232
services:
3333
postgres:
34-
image: postgres:9.6
34+
image: postgres:10
3535
env:
3636
POSTGRES_USER: 'postgres'
3737
POSTGRES_HOST_AUTH_METHOD: 'trust'

docs/TravisFileExplained.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ language: php
1313

1414
# Installs the updated version of PostgreSQL and extra APT packages.
1515
addons:
16-
postgresql: "9.6"
16+
postgresql: "10"
1717

1818
# Ensure DB and docker services are running.
1919
services:

gha.dist.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88

99
services:
1010
postgres:
11-
image: postgres:9.6
11+
image: postgres:10
1212
env:
1313
POSTGRES_USER: 'postgres'
1414
POSTGRES_HOST_AUTH_METHOD: 'trust'

0 commit comments

Comments
 (0)