# HG changeset patch # User Bram Moolenaar # Date 1632067204 -7200 # Node ID e2d74d655b75663a9d5b7d78aaef106334c0b638 # Parent 7f4f44c017420c90d5291d70354b85dbae17496d patch 8.2.3450: coveralls action fails Commit: https://github.com/vim/vim/commit/18fefddcb023db3c8461953892650b0c5f0cc9fe Author: Bram Moolenaar Date: Sun Sep 19 17:55:16 2021 +0200 patch 8.2.3450: coveralls action fails Problem: Coveralls action fails. Solution: Disable it for now. diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -201,18 +201,18 @@ 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: Codecov if: matrix.coverage && success() @@ -228,18 +228,18 @@ jobs: false # in order to fail a job done - coveralls: - runs-on: ubuntu-18.04 - - 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" + # coveralls: + # runs-on: ubuntu-18.04 + # + # 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" macos: runs-on: macos-latest diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -758,6 +758,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 3450, +/**/ 3449, /**/ 3448,