From f024ec21996cbc7e7267dbd314cc83f3f35b3e16 Mon Sep 17 00:00:00 2001 From: hustjieke Date: Thu, 2 Apr 2020 10:50:36 +0800 Subject: [PATCH] radon: mv .travis to intergration and put it in radon root dir #598 [summary] 1. rename .travis to intergration dir. 2. put intergration dir in radon root directory. [test case] N/A [patch codecov] N/A --- .travis.yml | 21 ++++++++----------- {.travis => intergration}/backend.json | 0 {.travis => intergration}/my3306.cnf | 0 {.travis => intergration}/my3307.cnf | 0 {.travis => intergration}/my3309.cnf | 0 {.travis => intergration}/radon-test/mtr.sh | 0 .../radon-test/r/ddl.result | 0 .../radon-test/r/select.result | 0 .../radon-test/t/ddl.test | 0 .../radon-test/t/select.test | 0 10 files changed, 9 insertions(+), 12 deletions(-) rename {.travis => intergration}/backend.json (100%) rename {.travis => intergration}/my3306.cnf (100%) rename {.travis => intergration}/my3307.cnf (100%) rename {.travis => intergration}/my3309.cnf (100%) rename {.travis => intergration}/radon-test/mtr.sh (100%) rename {.travis => intergration}/radon-test/r/ddl.result (100%) rename {.travis => intergration}/radon-test/r/select.result (100%) rename {.travis => intergration}/radon-test/t/ddl.test (100%) rename {.travis => intergration}/radon-test/t/select.test (100%) diff --git a/.travis.yml b/.travis.yml index a96e447b..f1dea4f7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,27 +5,24 @@ go: - 1.11.x before_script: - - mysqld --defaults-file=.travis/my3306.cnf --initialize-insecure - - mysqld --defaults-file=.travis/my3306.cnf & - - mysqld --defaults-file=.travis/my3307.cnf --initialize-insecure - - mysqld --defaults-file=.travis/my3307.cnf & - - mysqld --defaults-file=.travis/my3309.cnf --initialize-insecure - - mysqld --defaults-file=.travis/my3309.cnf & - - git clone https://github.com/radondb/radon.git - - cd radon + - mysqld --defaults-file=intergration/my3306.cnf --initialize-insecure + - mysqld --defaults-file=intergration/my3306.cnf & + - mysqld --defaults-file=intergration/my3307.cnf --initialize-insecure + - mysqld --defaults-file=intergration/my3307.cnf & + - mysqld --defaults-file=intergration/my3309.cnf --initialize-insecure + - mysqld --defaults-file=intergration/my3309.cnf & - make - mkdir -p bin/bin/radon-meta - - cp ../.travis/backend.json bin/bin/radon-meta/ + - cp intergration/backend.json bin/bin/radon-meta/ - cd ./bin - ./radon -c ../conf/radon.default.json & - - cd ../.. + - cd .. before_install: script: #test is used for make testcanal in shift - mysql -uroot -P3306 -h127.0.0.1 -e 'CREATE DATABASE IF NOT EXISTS test;' - - make build - make test - make coverage # testshift is used for make test on shift. We take it out alone because it needs to build at @@ -34,7 +31,7 @@ script: # integration_test is used to do integrate test on radondb - - cd .travis/radon-test + - cd intergration/radon-test - bash mtr.sh - cd - diff --git a/.travis/backend.json b/intergration/backend.json similarity index 100% rename from .travis/backend.json rename to intergration/backend.json diff --git a/.travis/my3306.cnf b/intergration/my3306.cnf similarity index 100% rename from .travis/my3306.cnf rename to intergration/my3306.cnf diff --git a/.travis/my3307.cnf b/intergration/my3307.cnf similarity index 100% rename from .travis/my3307.cnf rename to intergration/my3307.cnf diff --git a/.travis/my3309.cnf b/intergration/my3309.cnf similarity index 100% rename from .travis/my3309.cnf rename to intergration/my3309.cnf diff --git a/.travis/radon-test/mtr.sh b/intergration/radon-test/mtr.sh similarity index 100% rename from .travis/radon-test/mtr.sh rename to intergration/radon-test/mtr.sh diff --git a/.travis/radon-test/r/ddl.result b/intergration/radon-test/r/ddl.result similarity index 100% rename from .travis/radon-test/r/ddl.result rename to intergration/radon-test/r/ddl.result diff --git a/.travis/radon-test/r/select.result b/intergration/radon-test/r/select.result similarity index 100% rename from .travis/radon-test/r/select.result rename to intergration/radon-test/r/select.result diff --git a/.travis/radon-test/t/ddl.test b/intergration/radon-test/t/ddl.test similarity index 100% rename from .travis/radon-test/t/ddl.test rename to intergration/radon-test/t/ddl.test diff --git a/.travis/radon-test/t/select.test b/intergration/radon-test/t/select.test similarity index 100% rename from .travis/radon-test/t/select.test rename to intergration/radon-test/t/select.test