diff --git a/.drone.yml b/.drone.yml index 99a1a8e8..7fe3521c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -109,6 +109,7 @@ steps: pull: default image: golang:1.10 depends_on: + - build - test-sqlite - test-mysql - test-mysql-utf8mb4 @@ -195,11 +196,7 @@ steps: --- kind: pipeline -name: go1.13-test-sqlite -depends_on: - - clone -clone: - disable: true +name: go1.13-test steps: - name: test-sqlite pull: default @@ -215,14 +212,6 @@ steps: - push - pull_request ---- -kind: pipeline -name: go1.13-test-mysql -depends_on: - - clone -clone: - disable: true -steps: - name: test-mysql pull: default image: golang:1.13 @@ -264,27 +253,7 @@ steps: event: - push - pull_request -services: -- name: mysql - pull: default - image: mysql:5.7 - environment: - MYSQL_ALLOW_EMPTY_PASSWORD: yes - MYSQL_DATABASE: xorm_test - when: - event: - - push - - tag - - pull_request ---- -kind: pipeline -name: go1.13-test-postgres -depends_on: - - clone -clone: - disable: true -steps: - name: test-postgres pull: default image: golang:1.13 @@ -312,27 +281,7 @@ steps: event: - push - pull_request -services: -- name: pgsql - pull: default - image: postgres:9.5 - environment: - POSTGRES_DB: xorm_test - POSTGRES_USER: postgres - when: - event: - - push - - tag - - pull_request ---- -kind: pipeline -name: go1.13-test-mssql -depends_on: - - clone -clone: - disable: true -steps: - name: test-mssql pull: default image: golang:1.13 @@ -346,28 +295,7 @@ steps: event: - push - pull_request -services: -- name: mssql - pull: default - image: microsoft/mssql-server-linux:latest - environment: - ACCEPT_EULA: Y - SA_PASSWORD: yourStrong(!)Password - MSSQL_PID: Developer - when: - event: - - push - - tag - - pull_request ---- -kind: pipeline -name: go1.13-test-tidb -depends_on: - - clone -clone: - disable: true -steps: - name: test-tidb pull: default image: golang:1.13 @@ -384,6 +312,68 @@ steps: - push - pull_request +- name: merge_coverage + pull: default + image: golang:1.13 + environment: + GO111MODULE: "on" + GOPROXY: "https://goproxy.cn" + depends_on: + - test-sqlite + - test-mysql + - test-mysql-utf8mb4 + - test-mymysql + - test-postgres + - test-postgres-schema + - test-mssql + - test-tidb + commands: + - go get github.com/wadey/gocovmerge + - gocovmerge coverage1-1.txt coverage1-2.txt coverage2-1.txt coverage2-2.txt coverage2.1-1.txt coverage2.1-2.txt coverage3-1.txt coverage3-2.txt coverage4-1.txt coverage4-2.txt coverage5-1.txt coverage5-2.txt coverage6-1.txt coverage6-2.txt coverage7-1.txt coverage7-2.txt > coverage.txt + when: + event: + - push + - pull_request + +services: + +- name: mysql + pull: default + image: mysql:5.7 + environment: + MYSQL_ALLOW_EMPTY_PASSWORD: yes + MYSQL_DATABASE: xorm_test + when: + event: + - push + - tag + - pull_request + +- name: pgsql + pull: default + image: postgres:9.5 + environment: + POSTGRES_DB: xorm_test + POSTGRES_USER: postgres + when: + event: + - push + - tag + - pull_request + +- name: mssql + pull: default + image: microsoft/mssql-server-linux:latest + environment: + ACCEPT_EULA: Y + SA_PASSWORD: yourStrong(!)Password + MSSQL_PID: Developer + when: + event: + - push + - tag + - pull_request + - name: tidb pull: default image: pingcap/tidb:v3.0.3 @@ -391,31 +381,4 @@ steps: event: - push - tag - - pull_request - ---- -kind: pipeline -name: go1.13-merge_coverage -clone: - disable: true -depends_on: - - go1.13-build - - go1.13-test-sqlite - - go1.13-test-mysql - - go1.13-test-postgres - - go1.13-test-mssql - - go1.13-test-tidb -steps: -- name: merge_coverage - pull: default - image: golang:1.13 - environment: - GO111MODULE: "on" - GOPROXY: "https://goproxy.cn" - commands: - - go get github.com/wadey/gocovmerge - - gocovmerge coverage1-1.txt coverage1-2.txt coverage2-1.txt coverage2-2.txt coverage2.1-1.txt coverage2.1-2.txt coverage3-1.txt coverage3-2.txt coverage4-1.txt coverage4-2.txt coverage5-1.txt coverage5-2.txt coverage6-1.txt coverage6-2.txt coverage7-1.txt coverage7-2.txt > coverage.txt - when: - event: - - push - pull_request \ No newline at end of file