diff --git a/.github/workflows/test-docker.yml b/.github/workflows/test-docker.yml index 2b32bcfce..92e1de364 100644 --- a/.github/workflows/test-docker.yml +++ b/.github/workflows/test-docker.yml @@ -42,3 +42,26 @@ jobs: # The Pillow user in the docker container is UID 1000 sudo chown -R 1000 $GITHUB_WORKSPACE docker run -v $GITHUB_WORKSPACE:/Pillow pythonpillow/${{ matrix.docker }}:${{ matrix.dockerTag }} + sudo chown -R runner $GITHUB_WORKSPACE + + - name: After success + if: success() + run: | + pip install wheel + sudo apt-get install -qq ruby-dev + PATH="$PATH:~/.local/bin" + .travis/after_success.sh + env: + MATRIX_OS: ${{ matrix.os }} + COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }} + + - name: Prepare coverage token + if: success() && github.repository == 'python-pillow/Pillow' + run: cp .github/codecov-upstream.yml .codecov.yml + + - name: Upload coverage + if: success() + uses: codecov/codecov-action@v1 + with: + token: ${{ secrets.CODECOV_TOKEN }} + name: ${{ matrix.os }} Python ${{ matrix.python-version }} diff --git a/.travis/after_success.sh b/.travis/after_success.sh index ec4f027b4..2b1bc9f84 100755 --- a/.travis/after_success.sh +++ b/.travis/after_success.sh @@ -11,11 +11,12 @@ lcov --capture --directory . -b . --output-file coverage.info # filter to remove system headers lcov --remove coverage.info '/usr/*' -o coverage.filtered.info # convert to json -gem install coveralls-lcov +sudo gem install coveralls-lcov coveralls-lcov -v -n coverage.filtered.info > coverage.c.json -coverage report pip install codecov +coverage report + pip install coveralls-merge coveralls-merge coverage.c.json if [[ $TRAVIS ]]; then