From 5025b5370446173221ab0e0474d4dbf0fe8c89e4 Mon Sep 17 00:00:00 2001 From: Daniel Nephin Date: Tue, 14 Nov 2017 16:34:42 -0500 Subject: [PATCH] Re-enable unit tests on appveyor Signed-off-by: Daniel Nephin --- .appveyor.yml | 14 ++++---------- .travis.yml | 2 +- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 6e2494ccb..71fc13951 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -20,24 +20,18 @@ before_build: - appveyor DownloadFile https://storage.googleapis.com/golang/go%GO_VERSION%.windows-amd64.zip - 7z x go%GO_VERSION%.windows-amd64.zip -oC:\ >nul - go version - # TODO: re-enable once the content unit-test have been updated to pass on windows - #- choco install codecov + - choco install codecov build_script: - bash.exe -elc "export PATH=/c/tools/mingw64/bin:/c/gopath/bin:$PATH ; mingw32-make.exe setup check" - - bash.exe -elc "export PATH=/c/tools/mingw64/bin:$PATH ; mingw32-make.exe build" - - bash.exe -elc "export PATH=/c/tools/mingw64/bin:$PATH ; mingw32-make.exe binaries" + - bash.exe -elc "export PATH=/c/tools/mingw64/bin:$PATH ; mingw32-make.exe build binaries" test_script: # TODO: need an equivalent of TRAVIS_COMMIT_RANGE # - GIT_CHECK_EXCLUDE="./vendor" TRAVIS_COMMIT_RANGE="${TRAVIS_COMMIT_RANGE/.../..}" C:\MinGW\bin\mingw32-make.exe dco + - bash.exe -lc "export PATH=/c/tools/mingw64/bin:/c/gopath/src/github.com/containerd/containerd/bin:$PATH ; mingw32-make.exe coverage root-coverage" - bash.exe -elc "export PATH=/c/tools/mingw64/bin:/c/gopath/src/github.com/containerd/containerd/bin:$PATH ; mingw32-make.exe integration" - bash.exe -elc "export PATH=/c/tools/mingw64/bin:/c/gopath/src/github.com/containerd/containerd/bin:$PATH ; mingw32-make.exe integration-parallel" - # TODO: re-enable once the content unit-test have been updated to pass on windows - #- bash.exe -lc "export PATH=/c/tools/mingw64/bin:/c/gopath/src/github.com/containerd/containerd/bin:$PATH ; mingw32-make.exe coverage" - #- bash.exe -lc "export PATH=/c/tools/mingw64/bin:/c/gopath/src/github.com/containerd/containerd/bin:$PATH ; mingw32-make.exe root-coverage" on_success: - # Note that, a Codecov upload token is not required. - # TODO: re-enable once the content unit-test have been updated to pass on windows - #- codecov -f coverage.txt + codecov --flag windows diff --git a/.travis.yml b/.travis.yml index 8351057aa..a33fc828e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -65,7 +65,7 @@ script: - if [ "$GOOS" = "linux" ]; then sudo PATH=$PATH GOPATH=$GOPATH make integration-parallel ; fi after_success: - - bash <(curl -s https://codecov.io/bash) + - bash <(curl -s https://codecov.io/bash) -F linux before_deploy: - make release