From ccc4b12e643e7e53919ed2c9ed8793b20d1a80e2 Mon Sep 17 00:00:00 2001
From: "Eloy Lafuente (stronk7)" <stronk7@moodle.org>
Date: Sun, 9 May 2021 23:09:35 +0200
Subject: [PATCH] Move own tests to suit the new requirements

Also, bump to ubuntu-18.04, dist files already are recommending it,
hence not change needed there, only own tests.

This closes #96.
---
 .github/workflows/test.yml | 5 ++---
 .travis.yml                | 3 +--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 9da8dfb0..0e5c514d 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -25,7 +25,7 @@ jobs:
   citest:
     name: CI test
     needs: selftest
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-18.04
 
     services:
       postgres:
@@ -54,8 +54,6 @@ jobs:
             moodle-branch: 'MOODLE_38_STABLE'
           - php: '7.2'
             moodle-branch: 'MOODLE_35_STABLE'
-          - php: '7.0'
-            moodle-branch: 'MOODLE_35_STABLE'
 
     steps:
     - name: Check out repository code
@@ -102,6 +100,7 @@ jobs:
         moodle-plugin-ci mustache
         moodle-plugin-ci grunt ||  [ \
             "$MOODLE_BRANCH" != 'master' -a \
+            "$MOODLE_BRANCH" != 'MOODLE_311_STABLE' -a \
             "$MOODLE_BRANCH" != 'MOODLE_310_STABLE' -a \
             "$MOODLE_BRANCH" != 'MOODLE_39_STABLE' ]
         moodle-plugin-ci phpdoc
diff --git a/.travis.yml b/.travis.yml
index 8b73adb9..b4112fbf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -48,6 +48,7 @@ script:
   - moodle-plugin-ci mustache
   - moodle-plugin-ci grunt || [ \
         "$MOODLE_BRANCH" != 'master' -a \
+        "$MOODLE_BRANCH" != 'MOODLE_311_STABLE' -a \
         "$MOODLE_BRANCH" != 'MOODLE_310_STABLE' -a \
         "$MOODLE_BRANCH" != 'MOODLE_39_STABLE' ]
   - moodle-plugin-ci phpdoc
@@ -75,5 +76,3 @@ jobs:
       env: MOODLE_BRANCH=MOODLE_38_STABLE
     - php: 7.2
       env: MOODLE_BRANCH=MOODLE_35_STABLE
-    - php: 7.0
-      env: MOODLE_BRANCH=MOODLE_35_STABLE