# HG changeset patch # User Bram Moolenaar # Date 1641906903 -3600 # Node ID f1f47818f16edbeb106d6bd8db1dde33112f399f # Parent 8509d969e171301b9881524af98750fce75184da patch 8.2.4061: codecov bash script is deprecated Commit: https://github.com/vim/vim/commit/0d47ad40274ed9c7ace636b2a4063182c905a2b4 Author: ichizok Date: Tue Jan 11 13:05:26 2022 +0000 patch 8.2.4061: codecov bash script is deprecated Problem: Codecov bash script is deprecated. Solution: Use the codecov action. (Ozaki Kiichi, closes https://github.com/vim/vim/issues/9505) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -92,6 +92,7 @@ jobs: sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-13 100 sudo update-alternatives --set clang /usr/bin/clang-13 sudo update-alternatives --install /usr/bin/llvm-cov llvm-cov /usr/bin/llvm-cov-13 100 + sudo update-alternatives --install /usr/bin/asan_symbolize asan_symbolize /usr/bin/asan_symbolize-13 100 - name: Set up environment run: | @@ -119,7 +120,6 @@ jobs: ;; esac - CFLAGS="" if ${{ matrix.coverage == true }}; then CFLAGS="$CFLAGS --coverage -DUSE_GCOV_FLUSH" echo "LDFLAGS=--coverage" @@ -218,45 +218,51 @@ jobs: do_test() { sg audio "sg $(id -gn) '$*'"; } do_test make ${SHADOWOPT} ${TEST} - # - name: Coveralls - # if: matrix.coverage && success() && github.event_name != 'pull_request' - # env: - # COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }} - # COVERALLS_PARALLEL: true - # TRAVIS_JOB_ID: ${{ github.run_id }} - # run: | - # sudo apt-get install -y python3-setuptools python3-wheel - # sudo -H pip3 install pip -U - # # needed for https support for coveralls building cffi only works with gcc, not with clang - # CC=gcc pip3 install --user cpp-coveralls pyopenssl ndg-httpsclient pyasn1 - # ~/.local/bin/coveralls -b "${SRCDIR}" -x .xs -e "${SRCDIR}"/if_perl.c -e "${SRCDIR}"/xxd -e "${SRCDIR}"/libvterm --encodings utf-8 + # - name: Coveralls + # if: matrix.coverage && success() && github.event_name != 'pull_request' + # env: + # COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }} + # COVERALLS_PARALLEL: true + # TRAVIS_JOB_ID: ${{ github.run_id }} + # run: | + # sudo apt-get install -y python3-setuptools python3-wheel + # sudo -H pip3 install pip -U + # # needed for https support for coveralls building cffi only works with gcc, not with clang + # CC=gcc pip3 install --user cpp-coveralls pyopenssl ndg-httpsclient pyasn1 + # ~/.local/bin/coveralls -b "${SRCDIR}" -x .xs -e "${SRCDIR}"/if_perl.c -e "${SRCDIR}"/xxd -e "${SRCDIR}"/libvterm --encodings utf-8 + + - name: Generate gcov files + if: matrix.coverage && success() + run: | + cd "${SRCDIR}" + find . -type f -name '*.gcno' -exec gcov -pb {} + || true - name: Codecov if: matrix.coverage && success() - run: | - cd "${SRCDIR}" - bash <(curl -s https://codecov.io/bash) -F "${{ matrix.features }}-${{ matrix.compiler }}-${{ matrix.extra }}" + uses: codecov/codecov-action@v2 + with: + flags: ${{ matrix.features }}-${{ matrix.compiler }}-${{ matrix.extra }} - name: ASan logs if: contains(matrix.extra, 'asan') && !cancelled() run: | for f in $(grep -lR '#[[:digit:]]* *0x[[:digit:]a-fA-F]*' "${LOG_DIR}"); do - asan_symbolize-13 -l "$f" + asan_symbolize -l "$f" false # in order to fail a job done - # coveralls: - # runs-on: ubuntu-18.04 + # coveralls: + # runs-on: ubuntu-18.04 # - # needs: linux - # if: always() && github.event_name != 'pull_request' + # needs: linux + # if: always() && github.event_name != 'pull_request' # - # steps: - # - name: Parallel finished - # env: - # COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }} - # run: | - # curl -k "https://coveralls.io/webhook?repo_token=${COVERALLS_REPO_TOKEN}" -d "payload[build_num]=${GITHUB_RUN_ID}&payload[status]=done" + # steps: + # - name: Parallel finished + # env: + # COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }} + # run: | + # curl -k "https://coveralls.io/webhook?repo_token=${COVERALLS_REPO_TOKEN}" -d "payload[build_num]=${GITHUB_RUN_ID}&payload[status]=done" macos: runs-on: macos-latest diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 4061, +/**/ 4060, /**/ 4059,