Fix CI failures

moodleou · Nov 26, 2021 · d688c67 · d688c67
1 parent 1b9b823
commit d688c67
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -23,7 +23,7 @@ jobs:
 
     services:
       postgres:
-        image: postgres
+        image: postgres:10
         env:
           POSTGRES_USER: 'postgres'
           POSTGRES_HOST_AUTH_METHOD: 'trust'
@@ -36,7 +36,7 @@ jobs:
           - 5432:5432
 
       mariadb:
-        image: mariadb
+        image: mariadb:10.5
         env:
           MYSQL_USER: 'root'
           MYSQL_ALLOW_EMPTY_PASSWORD: "true"

diff --git a/amd/build/reportcategories.min.js.map b/amd/build/reportcategories.min.js.map
diff --git a/amd/build/userselector.min.js.map b/amd/build/userselector.min.js.map
diff --git a/amd/src/reportcategories.js b/amd/src/reportcategories.js
@@ -60,7 +60,7 @@ define(['jquery'], function($) {
         /**
          * Event handler for expanding or collapsing one section.
          *
-         * @param {Event} DOM event.
+         * @param {Event} e DOM event.
          */
         expandCollapseAll: function(e) {
             if ($('.csql_categoryshown').length === 0) {

diff --git a/amd/src/userselector.js b/amd/src/userselector.js
@@ -17,7 +17,6 @@
  * JavaScript module to work with the auto-complete of users.
  *
  * @module     report_customsql/userselector
- * @package    report_customsql
  * @copyright  2020 The Open University
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */

diff --git a/styles.css b/styles.css
@@ -35,5 +35,6 @@ body.path-admin-report-customsql a.view-category {
 
 #page-admin-report-customsql-edit #id_querysql {
     min-width: 100%;
-    font-family: "SF Mono", "Monaco", "Andale Mono", Consolas, "Lucida Console", "Bitstream Vera Sans Mono", "Courier New", Courier, monospace;
+    font-family: monospace;
+    line-height: 1.4;
 }