Skip to content

Commit b9d9cee

Browse files
committed
Changed line end to UNIX.
1 parent 30a11c7 commit b9d9cee

File tree

11 files changed

+23998
-12858
lines changed

11 files changed

+23998
-12858
lines changed

.github/workflows/moodle-plugin-ci.yml

Lines changed: 38 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
name: Moodle Plugin CI
2-
1+
name: Moodle plugin CI
32
on: [push, pull_request]
43

54
jobs:
@@ -8,18 +7,25 @@ jobs:
87

98
services:
109
postgres:
11-
image: postgres
10+
image: postgres:14
1211
env:
1312
POSTGRES_USER: 'postgres'
1413
POSTGRES_HOST_AUTH_METHOD: 'trust'
14+
options: >-
15+
--health-cmd pg_isready
16+
--health-interval 10s
17+
--health-timeout 5s
18+
--health-retries 3
1519
ports:
1620
- 5432:5432
17-
options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 3
21+
1822
mariadb:
19-
image: mariadb
23+
image: mariadb:10.6
2024
env:
2125
MYSQL_USER: 'root'
2226
MYSQL_ALLOW_EMPTY_PASSWORD: "true"
27+
MYSQL_CHARACTER_SET_SERVER: "utf8mb4"
28+
MYSQL_COLLATION_SERVER: "utf8mb4_unicode_ci"
2329
ports:
2430
- 3306:3306
2531
options: --health-cmd="mysqladmin ping" --health-interval 10s --health-timeout 5s --health-retries 3
@@ -28,33 +34,52 @@ jobs:
2834
fail-fast: false
2935
matrix:
3036
include:
31-
<<<<<<< HEAD
32-
=======
37+
- php: 8.2
38+
moodle-branch: MOODLE_403_STABLE
39+
database: pgsql
40+
- php: 8.2
41+
moodle-branch: MOODLE_403_STABLE
42+
database: mariadb
43+
- php: 8.2
44+
moodle-branch: MOODLE_402_STABLE
45+
database: pgsql
46+
- php: 8.2
47+
moodle-branch: MOODLE_402_STABLE
48+
database: mariadb
49+
50+
- php: 8.1
51+
moodle-branch: MOODLE_403_STABLE
52+
database: pgsql
53+
- php: 8.1
54+
moodle-branch: MOODLE_403_STABLE
55+
database: mariadb
56+
- php: 8.1
57+
moodle-branch: MOODLE_402_STABLE
58+
database: pgsql
59+
- php: 8.1
60+
moodle-branch: MOODLE_402_STABLE
61+
database: mariadb
3362
- php: 8.1
3463
moodle-branch: MOODLE_401_STABLE
3564
database: pgsql
3665
- php: 8.1
3766
moodle-branch: MOODLE_401_STABLE
3867
database: mariadb
3968

40-
>>>>>>> 123e1fd (Pdfannotator comment subscription like forum fixes #20.)
4169
- php: 8.0
4270
moodle-branch: MOODLE_401_STABLE
4371
database: pgsql
4472
- php: 8.0
4573
moodle-branch: MOODLE_401_STABLE
4674
database: mariadb
4775

48-
<<<<<<< HEAD
4976
- php: 8.0
5077
moodle-branch: MOODLE_400_STABLE
5178
database: pgsql
5279
- php: 8.0
5380
moodle-branch: MOODLE_400_STABLE
5481
database: mariadb
5582

56-
=======
57-
>>>>>>> 123e1fd (Pdfannotator comment subscription like forum fixes #20.)
5883
- php: 7.4
5984
moodle-branch: MOODLE_401_STABLE
6085
database: pgsql
@@ -85,7 +110,7 @@ jobs:
85110

86111
steps:
87112
- name: Check out repository code
88-
uses: actions/checkout@v3
113+
uses: actions/checkout@v4
89114
with:
90115
path: plugin
91116

@@ -159,4 +184,4 @@ jobs:
159184

160185
- name: Behat features
161186
if: ${{ always() }}
162-
run: moodle-plugin-ci behat --profile chrome
187+
run: moodle-plugin-ci behat --profile chrome

0 commit comments

Comments
 (0)