Revert "Merge pull request #4254 from astaxie/develop-2.0"

This reverts commit e284b0ddae, reversing
changes made to 8ef8fd2606.

.travis.yml

@@ -1,59 +1,30 @@
 language: go
 
 go:
-  - "1.14.x"
+  - "1.13.x"
 services:
   - redis-server
   - mysql
   - postgresql
   - memcached
-  - docker
 env:
   global:
     - GO_REPO_FULLNAME="github.com/astaxie/beego"
   matrix:
     - ORM_DRIVER=sqlite3   ORM_SOURCE=$TRAVIS_BUILD_DIR/orm_test.db
     - ORM_DRIVER=postgres ORM_SOURCE="user=postgres dbname=orm_test sslmode=disable"
-    - ORM_DRIVER=mysql export ORM_SOURCE="root:@/orm_test?charset=utf8"
 before_install:
-  # link the local repo with ${GOPATH}/src/<namespace>/<repo>
-  - GO_REPO_NAMESPACE=${GO_REPO_FULLNAME%/*}
-  # relies on GOPATH to contain only one directory...
-  - mkdir -p ${GOPATH}/src/${GO_REPO_NAMESPACE}
-  - ln -sv ${TRAVIS_BUILD_DIR} ${GOPATH}/src/${GO_REPO_FULLNAME}
-  - cd ${GOPATH}/src/${GO_REPO_FULLNAME}
-  # get and build ssdb
-  - git clone git://github.com/ideawu/ssdb.git
-  - cd ssdb
-  - make
-  - cd ..
-  #  - prepare etcd
-  #  - prepare for etcd unit tests
-  - rm -rf /tmp/etcd-data.tmp
-  - mkdir -p /tmp/etcd-data.tmp
-  - docker rmi gcr.io/etcd-development/etcd:v3.3.25 || true &&
-    docker run -d
-    -p 2379:2379
-    -p 2380:2380
-    --mount type=bind,source=/tmp/etcd-data.tmp,destination=/etcd-data
-    --name etcd-gcr-v3.3.25
-    gcr.io/etcd-development/etcd:v3.3.25
-    /usr/local/bin/etcd
-    --name s1
-    --data-dir /etcd-data
-    --listen-client-urls http://0.0.0.0:2379
-    --advertise-client-urls http://0.0.0.0:2379
-    --listen-peer-urls http://0.0.0.0:2380
-    --initial-advertise-peer-urls http://0.0.0.0:2380
-    --initial-cluster s1=http://0.0.0.0:2380
-    --initial-cluster-token tkn
-    --initial-cluster-state new
-  - docker exec etcd-gcr-v3.3.25 /bin/sh -c "ETCDCTL_API=3 /usr/local/bin/etcdctl put current.float 1.23"
-  - docker exec etcd-gcr-v3.3.25 /bin/sh -c "ETCDCTL_API=3 /usr/local/bin/etcdctl put current.bool true"
-  - docker exec etcd-gcr-v3.3.25 /bin/sh -c "ETCDCTL_API=3 /usr/local/bin/etcdctl put current.int 11"
-  - docker exec etcd-gcr-v3.3.25 /bin/sh -c "ETCDCTL_API=3 /usr/local/bin/etcdctl put current.string hello"
-  - docker exec etcd-gcr-v3.3.25 /bin/sh -c "ETCDCTL_API=3 /usr/local/bin/etcdctl put current.serialize.name test"
-  - docker exec etcd-gcr-v3.3.25 /bin/sh -c "ETCDCTL_API=3 /usr/local/bin/etcdctl put sub.sub.key1 sub.sub.key"
+   # link the local repo with ${GOPATH}/src/<namespace>/<repo>
+ - GO_REPO_NAMESPACE=${GO_REPO_FULLNAME%/*}
+   # relies on GOPATH to contain only one directory...
+ - mkdir -p ${GOPATH}/src/${GO_REPO_NAMESPACE}
+ - ln -sv ${TRAVIS_BUILD_DIR} ${GOPATH}/src/${GO_REPO_FULLNAME}
+ - cd ${GOPATH}/src/${GO_REPO_FULLNAME}
+   # get and build ssdb
+ - git clone git://github.com/ideawu/ssdb.git
+ - cd ssdb
+ - make
+ - cd ..
 install:
   - go get github.com/lib/pq
   - go get github.com/go-sql-driver/mysql
@@ -80,10 +51,7 @@ install:
   - go get -u golang.org/x/lint/golint
   - go get -u github.com/go-redis/redis
 before_script:
-
-  #  -
   - psql --version
-  #  - prepare for orm unit tests
   - sh -c "if [ '$ORM_DRIVER' = 'postgres' ]; then psql -c 'create database orm_test;' -U postgres; fi"
   - sh -c "if [ '$ORM_DRIVER' = 'mysql' ]; then mysql -u root -e 'create database orm_test;'; fi"
   - sh -c "if [ '$ORM_DRIVER' = 'sqlite' ]; then touch $TRAVIS_BUILD_DIR/orm_test.db; fi"
@@ -95,11 +63,11 @@ after_script:
   - killall -w ssdb-server
   - rm -rf ./res/var/*
 script:
-  - go test ./...
-  - staticcheck -show-ignored -checks "-ST1017,-U1000,-ST1005,-S1034,-S1012,-SA4006,-SA6005,-SA1019,-SA1024" ./
+  - go test -v ./...
+  - staticcheck -show-ignored -checks "-ST1017,-U1000,-ST1005,-S1034,-S1012,-SA4006,-SA6005,-SA1019,-SA1024"
   - unconvert $(go list ./... | grep -v /vendor/)
   - ineffassign .
   - find . ! \( -path './vendor' -prune \) -type f -name '*.go' -print0 | xargs -0 gofmt -l -s
   - golint ./...
 addons:
-  postgresql: "9.6"
+  postgresql: "9.6"