diff options
| author | Bram Moolenaar <Bram@vim.org> | 2021-09-19 17:55:16 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-09-19 17:55:16 +0200 |
| commit | 18fefddcb023db3c8461953892650b0c5f0cc9fe (patch) | |
| tree | 6381acef8bfffb55fecc03cb0d28f22fb7b194ff | |
| parent | c04f62346bfd6b92151908239a3c5ab1a7d18f2a (diff) | |
| download | vim-git-18fefddcb023db3c8461953892650b0c5f0cc9fe.tar.gz | |
patch 8.2.3450: coveralls action failsv8.2.3450
Problem: Coveralls action fails.
Solution: Disable it for now.
| -rw-r--r-- | .github/workflows/ci.yml | 48 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 26 insertions, 24 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7d84fca6d..c3cc065be 100644 --- 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 index 99a94e259..90e0358ad 100644 --- 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, |