diff options
| -rw-r--r-- | .github/workflows/ci.yml | 26 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 2 insertions, 26 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 207b7dd3fa..ca288aea84 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -231,19 +231,6 @@ jobs: do_test() { sg audio "sg $(id -gn) '$*'"; } do_test make ${SHADOWOPT} ${TEST} - # - name: Coveralls - # if: matrix.coverage && 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 run: | @@ -264,19 +251,6 @@ jobs: false # in order to fail a job done - # coveralls: - # runs-on: ubuntu-20.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 a873172226..20a6e99d32 100644 --- a/src/version.c +++ b/src/version.c @@ -696,6 +696,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1547, +/**/ 1546, /**/ 1545, |