Changed line end to UNIX.

rwthmoodle · Apr 3, 2024 · 5faf44f · 5faf44f
1 parent 30a11c7
commit 5faf44f
Show file tree

Hide file tree

Showing 11 changed files with 21,878 additions and 12,858 deletions.
diff --git a/.github/workflows/moodle-plugin-ci.yml b/.github/workflows/moodle-plugin-ci.yml
@@ -1,5 +1,4 @@
-name: Moodle Plugin CI
-
+name: Moodle plugin CI
 on: [push, pull_request]
 
 jobs:
@@ -8,18 +7,25 @@ jobs:
 
     services:
       postgres:
-        image: postgres
+        image: postgres:14
         env:
           POSTGRES_USER: 'postgres'
           POSTGRES_HOST_AUTH_METHOD: 'trust'
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 3
         ports:
           - 5432:5432
-        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 3
+
       mariadb:
-        image: mariadb
+        image: mariadb:10.6
         env:
           MYSQL_USER: 'root'
           MYSQL_ALLOW_EMPTY_PASSWORD: "true"
+          MYSQL_CHARACTER_SET_SERVER: "utf8mb4"
+          MYSQL_COLLATION_SERVER: "utf8mb4_unicode_ci"
         ports:
           - 3306:3306
         options: --health-cmd="mysqladmin ping" --health-interval 10s --health-timeout 5s --health-retries 3
@@ -28,33 +34,52 @@ jobs:
       fail-fast: false
       matrix:
         include:
-<<<<<<< HEAD
-=======
+          - php: 8.2
+            moodle-branch: MOODLE_403_STABLE
+            database: pgsql
+          - php: 8.2
+            moodle-branch: MOODLE_403_STABLE
+            database: mariadb
+          - php: 8.2
+            moodle-branch: MOODLE_402_STABLE
+            database: pgsql
+          - php: 8.2
+            moodle-branch: MOODLE_402_STABLE
+            database: mariadb
+
+          - php: 8.1
+            moodle-branch: MOODLE_403_STABLE
+            database: pgsql
+          - php: 8.1
+            moodle-branch: MOODLE_403_STABLE
+            database: mariadb
+          - php: 8.1
+            moodle-branch: MOODLE_402_STABLE
+            database: pgsql
+          - php: 8.1
+            moodle-branch: MOODLE_402_STABLE
+            database: mariadb
           - php: 8.1
             moodle-branch: MOODLE_401_STABLE
             database: pgsql
           - php: 8.1
             moodle-branch: MOODLE_401_STABLE
             database: mariadb
 
->>>>>>> 123e1fd (Pdfannotator comment subscription like forum fixes #20.)
           - php: 8.0
             moodle-branch: MOODLE_401_STABLE
             database: pgsql
           - php: 8.0
             moodle-branch: MOODLE_401_STABLE
             database: mariadb
 
-<<<<<<< HEAD
           - php: 8.0
             moodle-branch: MOODLE_400_STABLE
             database: pgsql
           - php: 8.0
             moodle-branch: MOODLE_400_STABLE
             database: mariadb
 
-=======
->>>>>>> 123e1fd (Pdfannotator comment subscription like forum fixes #20.)
           - php: 7.4
             moodle-branch: MOODLE_401_STABLE
             database: pgsql
@@ -85,7 +110,7 @@ jobs:
 
     steps:
       - name: Check out repository code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           path: plugin
 
@@ -159,4 +184,4 @@ jobs:
 
       - name: Behat features
         if: ${{ always() }}
-        run: moodle-plugin-ci behat --profile chrome
+        run: moodle-plugin-ci behat --profile chrome