Travis fix (#592)

* move ckeditor from require-dev to require * Delete composer.lock * Update .travis.yml * pinning mariadb to 10.7 to avoid timing issue workaround for github.com/MariaDB/mariadb-docker/issues/434
opencats · Mar 5, 2023 · 8e99785 · 8e99785
1 parent 43274ff
commit 8e99785
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3,456 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -21,7 +21,6 @@ script:
     - composer install
     - ./vendor/bin/phpunit src/OpenCATS/Tests/UnitTests
     - cd docker/; docker-compose -f docker-compose-test.yml up -d
-    - sleep 30
     - docker-compose -f docker-compose-test.yml exec php /var/www/public/test/runAllTests.sh
     - cd ..; ./ci/package-code.sh 
 

diff --git a/composer.json b/composer.json
@@ -7,7 +7,6 @@
         "behat/mink-extension": "dev-master",
         "behat/mink-goutte-driver": "^1.2",
         "behat/mink-selenium2-driver": "^1.3",
-        "ckeditor/ckeditor": "4.5.11",
         "codacy/coverage": "^1.4"
     },
     "autoload": {
@@ -16,6 +15,7 @@
         }
     },
     "require": {
-        "phpmailer/phpmailer": "^6.0"
+        "phpmailer/phpmailer": "^6.0",
+        "ckeditor/ckeditor": "4.5.11"
     }
 }