Skip to content

Commit 8739caa

Browse files
authored
Merge pull request #7 from catalyst/sync-fork
Sync fork
2 parents 7525fc7 + 0d01cda commit 8739caa

File tree

575 files changed

+33861
-17348
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

575 files changed

+33861
-17348
lines changed

.github/workflows/ci.yml

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,18 @@ jobs:
99
fail-fast: false
1010
matrix:
1111
include:
12-
- php: '8.0'
13-
moodle-branch: 'master'
14-
database: 'pgsql'
15-
- php: '7.4'
16-
moodle-branch: 'MOODLE_401_STABLE'
12+
- php: '8.3'
13+
moodle-branch: 'MOODLE_500_STABLE'
14+
database: 'mariadb'
15+
- php: '8.3'
16+
moodle-branch: 'MOODLE_405_STABLE'
17+
database: 'mariadb'
18+
- php: '8.2'
19+
moodle-branch: 'MOODLE_404_STABLE'
1720
database: 'pgsql'
18-
- php: '7.3'
19-
moodle-branch: 'MOODLE_400_STABLE'
21+
- php: '8.1'
22+
moodle-branch: 'MOODLE_403_STABLE'
2023
database: 'mariadb'
21-
2224
services:
2325
postgres:
2426
image: postgres:13
@@ -30,7 +32,7 @@ jobs:
3032
options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 3
3133

3234
mariadb:
33-
image: mariadb:10.5
35+
image: mariadb:10.6
3436
env:
3537
MYSQL_USER: 'root'
3638
MYSQL_ALLOW_EMPTY_PASSWORD: "true"
@@ -65,6 +67,9 @@ jobs:
6567
- name: Start JobeInABox
6668
run: sudo docker run -d -p 4000:80 --name jobe trampgeek/jobeinabox:latest
6769

70+
- name: Let JobeInABox settle
71+
run: sleep 5s
72+
6873
- name: Test JobeInABox
6974
run: |
7075
curl http://localhost:4000/jobe/index.php/restapi/languages
@@ -88,6 +93,7 @@ jobs:
8893
MOODLE_BRANCH: ${{ matrix.moodle-branch }}
8994

9095
- name: PHP Lint
96+
continue-on-error: true # This step will show errors but will not fail
9197
if: ${{ always() }}
9298
run: moodle-plugin-ci phplint
9399

@@ -102,10 +108,12 @@ jobs:
102108
run: moodle-plugin-ci phpmd
103109

104110
- name: Moodle Code Checker
111+
continue-on-error: true # This step will show errors but will not fail
105112
if: ${{ always() }}
106113
run: moodle-plugin-ci codechecker --max-warnings 0
107114

108115
- name: Moodle PHPDoc Checker
116+
continue-on-error: true # This step will show errors but will not fail
109117
if: ${{ always() }}
110118
run: moodle-plugin-ci phpdoc
111119

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,5 @@ NonRepoFiles/*
3333
/amd/src/ui_blockly.js
3434
/amd/src/ui_blockly.json
3535
/amd/src/.eslintrc.js
36+
.grunt
37+
.vscode/

.swp

132 KB
Binary file not shown.

0 commit comments

Comments
 (0)