diff --git a/ci/Jenkinsfile b/ci/Jenkinsfile index a84f8cb47cb..8860ce15ef3 100644 --- a/ci/Jenkinsfile +++ b/ci/Jenkinsfile @@ -93,6 +93,7 @@ def sharness_step = { run, osname, makeargs, ignore -> } finally { if (!ignore) { junit allowEmptyResults: true, testResults: 'test/sharness/test-results/sharness.xml' + run 'bash -c "bash <(curl -s https://codecov.io/bash) -f coverage/sharness_tests.coverprofile"' } } } @@ -167,6 +168,7 @@ ansiColor('xterm') { withEnv(['TERM=xterm-color']) { throw err } finally { junit allowEmptyResults: true, testResults: 'test/unit/gotest.junit.xml' + run 'bash -c "bash <(curl -s https://codecov.io/bash) -f coverage/unit_tests.coverprofile"' } } } diff --git a/circle.yml b/circle.yml deleted file mode 100644 index 1b4b2712eb6..00000000000 --- a/circle.yml +++ /dev/null @@ -1,40 +0,0 @@ -machine: - environment: - TEST_NO_FUSE: 1 - TEST_VERBOSE: 1 - TEST_NO_DOCKER: 1 - TRAVIS: 1 - CIRCLE: 1 - IMPORT_PATH: "github.com/ipfs/go-ipfs" - GOPATH: "$HOME/.go_workspace" - GOBIN: "$GOPATH/bin" - SERVICE: "circle-ci" - - post: - - sudo rm -rf /usr/local/go - - if [ ! -e go1.10.2.linux-amd64.tar.gz ]; then curl -o go1.10.2.linux-amd64.tar.gz https://storage.googleapis.com/golang/go1.10.2.linux-amd64.tar.gz; fi - - sudo tar -C /usr/local -xzf go1.10.2.linux-amd64.tar.gz - - services: - - docker - -dependencies: - pre: - # setup ipv6 - - sudo sysctl -w net.ipv6.conf.lo.disable_ipv6=0 net.ipv6.conf.default.disable_ipv6=0 net.ipv6.conf.all.disable_ipv6=0 - - override: - - rm -rf "$HOME/.go_workspace/src/$IMPORT_PATH" - - mkdir -p "$HOME/.go_workspace/src/$IMPORT_PATH" - - cp -aT . "$HOME/.go_workspace/src/$IMPORT_PATH" - - cd "$HOME/.go_workspace/src/$IMPORT_PATH" && make deps - - cache_directories: - - ~/go1.10.2.linux-amd64.tar.gz - - ~/.go_workspace/src/gx/ipfs - -test: - override: - - bin/circle.sh: - pwd: "../.go_workspace/src/$IMPORT_PATH" - parallel: true diff --git a/codecov.yml b/codecov.yml index 71f7741477a..9fc010e2e64 100644 --- a/codecov.yml +++ b/codecov.yml @@ -1,9 +1,9 @@ codecov: ci: - - "ci/circle-ci" + - "!ci/circle-ci" - "!travis-ci.org" - - "!ci.ipfs.team:8111" - - "!ci.ipfs.team" + - "ci.ipfs.team:8111" + - "ci.ipfs.team" notify: require_ci_to_pass: no after_n_builds: 2