Browse Source

Updating travis.yml to make the build succed

Lucas Villeneuve 5 năm trước cách đây
mục cha
commit
17fd247ebb
2 tập tin đã thay đổi với 33 bổ sung16 xóa
  1. 14 2
      .travis.yml
  2. 19 14
      extra/myanimebot-init.sql

+ 14 - 2
.travis.yml

@@ -1,15 +1,27 @@
 language: python
 python:
   - 3.7
-addons:
-  mariadb: 10.5.6
 before_install:
+  - sudo apt remove *mysql*
+  - sudo apt install software-properties-common gnupg-curl apt-transport-https
+  - sudo apt-key adv --fetch-keys 'http://mariadb.org/mariadb_release_signing_key.asc'
+  - sudo add-apt-repository 'deb [arch=amd64,arm64,i386,ppc64el] http://mariadb.mirrors.ovh.net/MariaDB/repo/10.5/ubuntu xenial main'
+  - sudo apt update
+  - sudo apt install mariadb-client mariadb-server mariadb-common libmariadb-dev libmariadb3
+  - mysql --version
   - python --version
   - pip install -U pip
   - pip install -U pytest
   - pip install codecov
 install:
   - pip install -r requirements.txt
+  - sudo mariadb-upgrade
+  - sudo sed -i '/\[mysqld\]/ a event_scheduler=ON\nuserstat=1\nperformance_schema=ON' /etc/mysql/mariadb.conf.d/50-server.cnf
+  - sudo systemctl restart mariadb
+  - sudo mariadb < extra/myanimebot-init.sql
+  - sudo mariadb -e "CREATE USER IF NOT EXISTS 'myanimebot'@'localhost' IDENTIFIED BY 'myPassword'; GRANT ALL PRIVILEGES ON myanimebot.* TO 'myanimebot'@'localhost'; FLUSH PRIVILEGES;"
+  - sed 's/token = 123456789ABCDEF987654321FEDCBA/token = '"$DISCORD_TOKEN"'/' myanimebot.example.conf > myanimebot.conf
+  - mkdir "logs"
 script: python -m pytest tests # run tests
 after_success:
   - codecov # submit coverage

+ 19 - 14
extra/initDB.sql → extra/myanimebot-init.sql

@@ -1,6 +1,6 @@
 -- --------------------------------------------------------
--- Server version:               10.5.5-MariaDB - MariaDB Server
--- Server OS:                    Linux
+-- Server version:               10.5.6-MariaDB-log - FreeBSD Ports
+-- Server OS:                    FreeBSD12.2
 -- --------------------------------------------------------
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
@@ -8,16 +8,18 @@
 /*!50503 SET NAMES utf8mb4 */;
 /*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 
 
 -- Dumping database structure for myanimebot
-CREATE DATABASE IF NOT EXISTS `myanimebot` /*!40100 DEFAULT CHARACTER SET utf8mb4 */;
+CREATE DATABASE IF NOT EXISTS `myanimebot` /*!40100 DEFAULT CHARACTER SET utf8 */;
 USE `myanimebot`;
 
 -- Dumping structure for view myanimebot.check_DuplicateFeeds
 -- Creating temporary table to overcome VIEW dependency errors
 CREATE TABLE `check_DuplicateFeeds` (
 	`published` DATETIME NOT NULL,
+	`service` TINYTEXT NOT NULL COLLATE 'utf8mb4_general_ci',
 	`title` MEDIUMTEXT NULL COLLATE 'utf8mb4_general_ci',
 	`user` TINYTEXT NULL COLLATE 'utf8mb4_general_ci',
 	`total` BIGINT(21) NOT NULL
@@ -283,7 +285,7 @@ CREATE TABLE IF NOT EXISTS `job_TopAnimes` (
   `total` bigint(21) NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`),
   KEY `idx_anime` (`anime`(768))
-) ENGINE=InnoDB AUTO_INCREMENT=3237 DEFAULT CHARSET=utf8mb4 COMMENT='Autogenerated - Top listed animes and number of users';
+) ENGINE=InnoDB AUTO_INCREMENT=3187 DEFAULT CHARSET=utf8mb4 COMMENT='Autogenerated - Top listed animes and number of users';
 
 -- Data exporting was unselected.
 
@@ -296,7 +298,7 @@ CREATE TABLE IF NOT EXISTS `job_TopUniqueAnimePerUsers` (
   PRIMARY KEY (`id`),
   KEY `idx_user` (`user`(255)),
   KEY `idx_title` (`title`(768))
-) ENGINE=InnoDB AUTO_INCREMENT=4883 DEFAULT CHARSET=utf8mb4 COMMENT='Autogenerated - Unique Anime feeds per users';
+) ENGINE=InnoDB AUTO_INCREMENT=4768 DEFAULT CHARSET=utf8mb4 COMMENT='Autogenerated - Unique Anime feeds per users';
 
 -- Data exporting was unselected.
 
@@ -474,8 +476,9 @@ CREATE TABLE IF NOT EXISTS `t_animes` (
   KEY `idx_title` (`title`(768)),
   KEY `idx_discoverer` (`discoverer`(255)),
   KEY `idx_media` (`media`(255)),
+  KEY `idx_service` (`service`(255)),
   FULLTEXT KEY `idx_title_str` (`title`)
-) ENGINE=InnoDB AUTO_INCREMENT=3329 DEFAULT CHARSET=utf8mb4 AVG_ROW_LENGTH=224;
+) ENGINE=InnoDB AUTO_INCREMENT=3177 DEFAULT CHARSET=utf8mb4 AVG_ROW_LENGTH=224;
 
 -- Data exporting was unselected.
 
@@ -507,8 +510,9 @@ CREATE TABLE IF NOT EXISTS `t_feeds` (
   KEY `idx_title` (`title`(768)),
   KEY `idx_published` (`published`),
   KEY `idx_type` (`type`(255)),
+  KEY `idx_service` (`service`(255)),
   FULLTEXT KEY `idx_title_str` (`title`)
-) ENGINE=InnoDB AUTO_INCREMENT=14769 DEFAULT CHARSET=utf8mb4 AVG_ROW_LENGTH=172;
+) ENGINE=InnoDB AUTO_INCREMENT=14151 DEFAULT CHARSET=utf8mb4 AVG_ROW_LENGTH=172;
 
 -- Data exporting was unselected.
 
@@ -544,8 +548,8 @@ CREATE TABLE IF NOT EXISTS `t_logs` (
   `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
   `host` tinytext CHARACTER SET latin1 NOT NULL DEFAULT 'unspecified.host',
   `level` int(11) DEFAULT NULL,
-  `type` mediumtext CHARACTER SET utf8 DEFAULT NULL,
-  `log` text CHARACTER SET latin1 DEFAULT NULL,
+  `type` text CHARACTER SET latin1 DEFAULT NULL,
+  `log` mediumtext DEFAULT NULL,
   `date` datetime NOT NULL DEFAULT current_timestamp(),
   `source` tinytext CHARACTER SET latin1 NOT NULL DEFAULT 'unknown',
   PRIMARY KEY (`id`),
@@ -554,7 +558,7 @@ CREATE TABLE IF NOT EXISTS `t_logs` (
   KEY `idx_host` (`host`(255)),
   KEY `idx_by` (`source`(255)) USING BTREE,
   FULLTEXT KEY `idx_log` (`log`)
-) ENGINE=InnoDB AUTO_INCREMENT=62280 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=COMPRESSED;
+) ENGINE=InnoDB AUTO_INCREMENT=229107 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=COMPRESSED;
 
 -- Data exporting was unselected.
 
@@ -587,11 +591,11 @@ CREATE TABLE IF NOT EXISTS `t_users` (
   `servers` text DEFAULT NULL,
   `added` datetime NOT NULL DEFAULT current_timestamp(),
   PRIMARY KEY (`id`),
-  UNIQUE KEY `idx_user` (`mal_user`(255)) USING BTREE,
   KEY `idx_servers` (`servers`(768)),
   KEY `idx_service` (`service`(255)),
+  KEY `idx_user` (`mal_user`(255)) USING BTREE,
   FULLTEXT KEY `idx_servers_str` (`servers`)
-) ENGINE=InnoDB AUTO_INCREMENT=27 DEFAULT CHARSET=utf8mb4 AVG_ROW_LENGTH=1820 COMMENT='Table where are stored the users of this bot.';
+) ENGINE=InnoDB AUTO_INCREMENT=48 DEFAULT CHARSET=utf8mb4 AVG_ROW_LENGTH=1820 COMMENT='Table where are stored the users of this bot.';
 
 -- Data exporting was unselected.
 
@@ -686,7 +690,7 @@ CREATE TABLE `v_TotalFeeds` (
 -- Dumping structure for view myanimebot.check_DuplicateFeeds
 -- Removing temporary table and create final VIEW structure
 DROP TABLE IF EXISTS `check_DuplicateFeeds`;
-CREATE ALGORITHM=UNDEFINED SQL SECURITY DEFINER VIEW `check_DuplicateFeeds` AS select `t_feeds`.`published` AS `published`,`t_feeds`.`title` AS `title`,`t_feeds`.`user` AS `user`,count(0) AS `total` from `t_feeds` group by `t_feeds`.`published`,`t_feeds`.`title`,`t_feeds`.`user` having count(0) > 1;
+CREATE ALGORITHM=UNDEFINED SQL SECURITY DEFINER VIEW `check_DuplicateFeeds` AS select `t_feeds`.`published` AS `published`,`t_feeds`.`service` AS `service`,`t_feeds`.`title` AS `title`,`t_feeds`.`user` AS `user`,count(0) AS `total` from `t_feeds` group by `t_feeds`.`published`,`t_feeds`.`title`,`t_feeds`.`user` having count(0) > 1;
 
 -- Dumping structure for view myanimebot.check_DuplicateMedia
 -- Removing temporary table and create final VIEW structure
@@ -741,7 +745,7 @@ CREATE ALGORITHM=UNDEFINED SQL SECURITY DEFINER VIEW `v_DailyHistory` AS select
 -- Dumping structure for view myanimebot.v_Top
 -- Removing temporary table and create final VIEW structure
 DROP TABLE IF EXISTS `v_Top`;
-CREATE ALGORITHM=TEMPTABLE SQL SECURITY INVOKER VIEW `v_Top` AS select `t_feeds`.`user` AS `user`,count(`t_feeds`.`title`) AS `total` from `t_feeds` group by `t_feeds`.`user` order by count(`t_feeds`.`title`) desc;
+CREATE ALGORITHM=TEMPTABLE SQL SECURITY DEFINER VIEW `v_Top` AS select `t_feeds`.`user` AS `user`,count(`t_feeds`.`title`) AS `total` from `t_feeds` group by `t_feeds`.`user` order by count(`t_feeds`.`title`) desc;
 
 -- Dumping structure for view myanimebot.v_TopAnimes
 -- Removing temporary table and create final VIEW structure
@@ -771,3 +775,4 @@ CREATE ALGORITHM=TEMPTABLE SQL SECURITY INVOKER VIEW `v_TotalFeeds` AS select co
 /*!40101 SET SQL_MODE=IFNULL(@OLD_SQL_MODE, '') */;
 /*!40014 SET FOREIGN_KEY_CHECKS=IF(@OLD_FOREIGN_KEY_CHECKS IS NULL, 1, @OLD_FOREIGN_KEY_CHECKS) */;
 /*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;