From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 13 Feb 2021 16:08:33 +0000 (+0100)
Subject: patch 8.2.2507: github build may fail if Ubuntu 20.04 is used
X-Git-Tag: v8.2.2507
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0fa09676c25a0a4a01f339887b8bf40b4673621f;p=vim

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
index 77912f7b2..9127455bc 100644
--- 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
index 6d01fa882..eeddd866d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2507,
 /**/
     2506,
 /**/