Skip to content

Commit a0b3caf

Browse files
committed
Update c-ares from 1.19.1 to 1.26.0
1 parent b00b4fb commit a0b3caf

214 files changed

Lines changed: 83194 additions & 68178 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/ci.yml

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,10 @@ jobs:
152152
###
153153
- name: Cache ~/.ccache
154154
uses: actions/cache@v4
155+
# This is repeated in an explicit save always step below
156+
# because normally it won't save anything if there's a cache hit!
157+
# Which is silly, because things in the cache might have (will have)
158+
# been changed.
155159
with:
156160
path: ~/.ccache/**
157161
key: ${{ runner.os }}-ccache2-${{ matrix.python-version }}
@@ -240,6 +244,12 @@ jobs:
240244
run: |
241245
ls -l dist
242246
twine check dist/*whl
247+
- name: Cache ~/.ccache
248+
uses: actions/cache/save@v4
249+
if: always()
250+
with:
251+
path: ~/.ccache/**
252+
key: ${{ runner.os }}-ccache2-${{ matrix.python-version }}
243253
- name: Upload gevent wheel
244254
uses: actions/upload-artifact@v4
245255
with:
@@ -270,8 +280,7 @@ jobs:
270280
echo CCache stats
271281
ccache --version
272282
ccache -s -v
273-
echo CCache Dir
274-
ls -l $CCACHE_DIR || true
283+
275284
276285
- name: "Tests: Basic"
277286
run: |
@@ -293,8 +302,8 @@ jobs:
293302
run: |
294303
python -m gevent.tests --second-chance $G_USE_COV `(cd src/gevent/tests >/dev/null && ls test__*subprocess*.py)`
295304
- name: "Tests: c-ares resolver"
296-
# This sometimes fails on mac.
297-
if: (matrix.python-version == '3.11.8') && startsWith(runner.os, 'Linux')
305+
# This sometimes fails on mac. # && (matrix.python-version == '3.11.8')
306+
if: startsWith(runner.os, 'Linux')
298307
env:
299308
GEVENT_RESOLVER: ares
300309
run: |

deps/README.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ Updating c-ares
4747
rm -f c-ares/CMakeLists.txt
4848
rm -f c-ares/RELEASE-PROCEDURE.md c-ares/CONTRIBUTING.md c-ares/SECURITY.md
4949
rm -f c-ares/*.cmake c-ares/*.cmake.in
50+
rm -f c-ares/config/
5051
rm -f c-ares/buildconf.bat
5152
git apply cares-make.patch
5253

@@ -63,7 +64,8 @@ Updating c-ares
6364
``cares-make.patch``, or you'll get the diff of the patch itself in
6465
the diff!).
6566

66-
- Follow the same 'config.guess' and 'config.sub' steps as libev.
67+
- Follow the same 'config.guess' and 'config.sub' steps as libev,
68+
except the files belong in the ``config/`` subdir.
6769

6870

6971
Updating libuv

0 commit comments

Comments
 (0)