# HG changeset patch # User Bram Moolenaar # Date 1613232905 -3600 # Node ID c0669a521a71503632b3207b6f843792c27de0d9 # Parent 45fb23517cc31dd0db7c0f4291e9c88e676bf17b patch 8.2.2507: github build may fail if Ubuntu 20.04 is used Commit: https://github.com/vim/vim/commit/0fa09676c25a0a4a01f339887b8bf40b4673621f Author: Bram Moolenaar Date: Sat Feb 13 17:08:33 2021 +0100 patch 8.2.2507: github build may fail if Ubuntu 20.04 is used Problem: Github build may fail if Ubuntu 20.04 is used. Installing rust is not needed. Solution: Specify ubuntu-18.04 instead of latest. Update "pip" instead of installing rust. (Ozaki Kiichi, closes #7820) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,7 +7,7 @@ on: jobs: linux: - runs-on: ubuntu-latest + runs-on: ubuntu-18.04 env: CC: ${{ matrix.compiler }} @@ -207,8 +207,8 @@ jobs: COVERALLS_PARALLEL: true TRAVIS_JOB_ID: ${{ github.run_id }} run: | - sudo apt-get install -y python3-setuptools python3-wheel rustc - pip3 install --user setuptools-rust + 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 @@ -228,7 +228,7 @@ jobs: done coveralls: - runs-on: ubuntu-latest + runs-on: ubuntu-18.04 needs: linux if: always() && github.event_name != 'pull_request' 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 */ /**/ + 2507, +/**/ 2506, /**/ 2505,