Skip to content

Commit 0fa0967

Browse files
committed
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)
1 parent c150c09 commit 0fa0967

2 files changed

Lines changed: 6 additions & 4 deletions

File tree

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77

88
jobs:
99
linux:
10-
runs-on: ubuntu-latest
10+
runs-on: ubuntu-18.04
1111

1212
env:
1313
CC: ${{ matrix.compiler }}
@@ -207,8 +207,8 @@ jobs:
207207
COVERALLS_PARALLEL: true
208208
TRAVIS_JOB_ID: ${{ github.run_id }}
209209
run: |
210-
sudo apt-get install -y python3-setuptools python3-wheel rustc
211-
pip3 install --user setuptools-rust
210+
sudo apt-get install -y python3-setuptools python3-wheel
211+
sudo -H pip3 install pip -U
212212
# needed for https support for coveralls building cffi only works with gcc, not with clang
213213
CC=gcc pip3 install --user cpp-coveralls pyopenssl ndg-httpsclient pyasn1
214214
~/.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:
228228
done
229229
230230
coveralls:
231-
runs-on: ubuntu-latest
231+
runs-on: ubuntu-18.04
232232

233233
needs: linux
234234
if: always() && github.event_name != 'pull_request'

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -750,6 +750,8 @@ static char *(features[]) =
750750

751751
static int included_patches[] =
752752
{ /* Add new patch number below this line */
753+
/**/
754+
2507,
753755
/**/
754756
2506,
755757
/**/

0 commit comments

Comments
 (0)