Skip to content

Commit f6c79a0

Browse files
odsods
authored
Update actions, fix publishing (#1063)
1 parent 7133562 commit f6c79a0

File tree

3 files changed

+55
-54
lines changed

3 files changed

+55
-54
lines changed

‎.github/workflows/codeql.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727

2828
steps:
2929
- name: Checkout repository
30-
uses: actions/checkout@v3
30+
uses: actions/checkout@v4
3131

3232
# Initializes the CodeQL tools for scanning.
3333
- name: Initialize CodeQL

‎.github/workflows/publish.yml

+36-35
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ jobs:
1212
package-source:
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@v2
16-
- uses: actions/setup-python@v2
15+
- uses: actions/checkout@v4
16+
- uses: actions/setup-python@v5
1717
with:
1818
python-version: "3.9"
1919
- name: Prepare C files to include
@@ -25,9 +25,9 @@ jobs:
2525
- name: Build source package
2626
run: python -m build --sdist
2727
- name: Upload source package
28-
uses: actions/upload-artifact@v2
28+
uses: actions/upload-artifact@v4
2929
with:
30-
name: dist
30+
name: dist-source
3131
path: dist/
3232

3333
package-wheel:
@@ -49,17 +49,17 @@ jobs:
4949
- os: windows-latest
5050
arch: amd64
5151
steps:
52-
- uses: actions/checkout@v2
53-
- uses: actions/setup-python@v2
52+
- uses: actions/checkout@v4
53+
- uses: actions/setup-python@v5
5454
with:
5555
python-version: "3.9"
5656
- name: Set up QEMU
5757
if: ${{ matrix.arch == 'aarch64' }}
58-
uses: docker/setup-qemu-action@v1
58+
uses: docker/setup-qemu-action@v3
5959
- name: Build wheels
6060
env:
6161
CIBW_ARCHS_LINUX: ${{matrix.arch}}
62-
CIBW_BUILD: cp38-* cp39-* cp310-* cp311-* cp312-*
62+
CIBW_BUILD: cp39-* cp310-* cp311-* cp312-* cp313-*
6363
CIBW_SKIP: '*-musllinux*'
6464
CIBW_BEFORE_BUILD_LINUX: pip install -r requirements-cython.txt && yum install -y zlib-devel
6565
# On windows and mac we should have z library preinstalled
@@ -71,9 +71,9 @@ jobs:
7171
cibuildwheel --output-dir dist
7272
shell: bash
7373
- name: Upload wheels
74-
uses: actions/upload-artifact@v2
74+
uses: actions/upload-artifact@v4
7575
with:
76-
name: dist
76+
name: dist-${{ matrix.os }}-${{ matrix.arch }}
7777
path: dist/
7878

7979
test-wheels-windows:
@@ -96,14 +96,14 @@ jobs:
9696
aiokafka_whl: dist/aiokafka-*-cp313-cp313-win_amd64.whl
9797

9898
steps:
99-
- uses: actions/checkout@v2
99+
- uses: actions/checkout@v4
100100
- name: Download distributions
101-
uses: actions/download-artifact@v2
101+
uses: actions/download-artifact@v4
102102
with:
103-
name: dist
103+
name: dist-windows-latest-amd64
104104
path: dist/
105105
- name: Set up Python
106-
uses: actions/setup-python@v2
106+
uses: actions/setup-python@v5
107107
with:
108108
python-version: ${{ matrix.python }}
109109

@@ -141,14 +141,14 @@ jobs:
141141
aiokafka_whl: dist/aiokafka-*-cp313-cp313-macosx_*_x86_64.whl
142142

143143
steps:
144-
- uses: actions/checkout@v2
144+
- uses: actions/checkout@v4
145145
- name: Download distributions
146-
uses: actions/download-artifact@v2
146+
uses: actions/download-artifact@v4
147147
with:
148-
name: dist
148+
name: dist-macos-13-x86_64
149149
path: dist/
150150
- name: Set up Python
151-
uses: actions/setup-python@v2
151+
uses: actions/setup-python@v5
152152
with:
153153
python-version: ${{ matrix.python }}
154154

@@ -184,14 +184,14 @@ jobs:
184184
aiokafka_whl: dist/aiokafka-*-cp313-cp313-macosx_*_arm64.whl
185185

186186
steps:
187-
- uses: actions/checkout@v2
187+
- uses: actions/checkout@v4
188188
- name: Download distributions
189-
uses: actions/download-artifact@v2
189+
uses: actions/download-artifact@v4
190190
with:
191-
name: dist
191+
name: dist-macos-latest-arm64
192192
path: dist/
193193
- name: Set up Python
194-
uses: actions/setup-python@v2
194+
uses: actions/setup-python@v5
195195
with:
196196
python-version: ${{ matrix.python }}
197197

@@ -227,14 +227,14 @@ jobs:
227227
aiokafka_whl: dist/aiokafka-*-cp313-cp313-manylinux*_x86_64.whl
228228

229229
steps:
230-
- uses: actions/checkout@v2
230+
- uses: actions/checkout@v4
231231
- name: Download distributions
232-
uses: actions/download-artifact@v2
232+
uses: actions/download-artifact@v4
233233
with:
234-
name: dist
234+
name: dist-ubuntu-latest-x86_64
235235
path: dist/
236236
- name: Set up Python
237-
uses: actions/setup-python@v2
237+
uses: actions/setup-python@v5
238238
with:
239239
python-version: ${{ matrix.python }}
240240

@@ -264,8 +264,6 @@ jobs:
264264
strategy:
265265
matrix:
266266
include:
267-
- pyver: cp38-cp38
268-
aiokafka_whl: dist/aiokafka-*-cp38-cp38-manylinux*_aarch64.whl
269267
- pyver: cp39-cp39
270268
aiokafka_whl: dist/aiokafka-*-cp39-cp39-manylinux*_aarch64.whl
271269
- pyver: cp310-cp310
@@ -274,16 +272,18 @@ jobs:
274272
aiokafka_whl: dist/aiokafka-*-cp311-cp311-manylinux*_aarch64.whl
275273
- pyver: cp312-cp312
276274
aiokafka_whl: dist/aiokafka-*-cp312-cp312-manylinux*_aarch64.whl
275+
- pyver: cp313-cp313
276+
aiokafka_whl: dist/aiokafka-*-cp313-cp313-manylinux*_aarch64.whl
277277

278278
steps:
279-
- uses: actions/checkout@v2
279+
- uses: actions/checkout@v4
280280
- name: Set up QEMU
281281
id: qemu
282-
uses: docker/setup-qemu-action@v1
282+
uses: docker/setup-qemu-action@v3
283283
- name: Download distributions
284-
uses: actions/download-artifact@v2
284+
uses: actions/download-artifact@v4
285285
with:
286-
name: dist
286+
name: dist-ubuntu-latest-aarch64
287287
path: dist/
288288
- name: Test Wheel
289289
run: |
@@ -320,11 +320,12 @@ jobs:
320320
https://pypi.org/project/aiokafka/${{ github.ref_name }}
321321
322322
steps:
323-
- uses: actions/checkout@v2
323+
- uses: actions/checkout@v4
324324
- name: Download distributions
325-
uses: actions/download-artifact@v2
325+
uses: actions/download-artifact@v4
326326
with:
327-
name: dist
328327
path: dist/
328+
pattern: dist-*
329+
merge-multiple: true
329330
- name: Publish to PyPI
330331
uses: pypa/gh-action-pypi-publish@release/v1

‎.github/workflows/tests.yml

+18-18
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ jobs:
1818
runs-on: ubuntu-latest
1919

2020
steps:
21-
- uses: actions/checkout@v2
21+
- uses: actions/checkout@v4
2222
- name: Set up Python
23-
uses: actions/setup-python@v2
23+
uses: actions/setup-python@v5
2424
with:
2525
python-version: 3.9
2626

@@ -36,7 +36,7 @@ jobs:
3636
echo "::set-output name=dir::$(pip cache dir)"
3737
3838
- name: Cache packages
39-
uses: actions/cache@v1
39+
uses: actions/cache@v4
4040
with:
4141
path: ${{ steps.pip-cache.outputs.dir }}
4242
key: ${{ runner.os }}-py-3.9-${{ hashFiles('requirements-ci.txt') }}-${{ hashFiles('setup.py') }}
@@ -76,11 +76,11 @@ jobs:
7676
python: ["3.9", "3.10", "3.11", "3.12", "3.13"]
7777

7878
steps:
79-
- uses: actions/checkout@v2
79+
- uses: actions/checkout@v4
8080
with:
8181
ref: ${{ github.event.pull_request.head.sha }}
8282
- name: Set up Python
83-
uses: actions/setup-python@v2
83+
uses: actions/setup-python@v5
8484
with:
8585
python-version: ${{ matrix.python }}
8686

@@ -91,7 +91,7 @@ jobs:
9191
echo "::set-output name=dir::$(pip cache dir)"
9292
9393
- name: Cache packages
94-
uses: actions/cache@v1
94+
uses: actions/cache@v4
9595
with:
9696
path: ${{ steps.pip-cache.outputs.dir }}
9797
key: ${{ runner.os }}-py-${{ matrix.python }}-${{ hashFiles('requirements-win-test.txt') }}-${{ hashFiles('setup.py') }}
@@ -120,15 +120,15 @@ jobs:
120120
AIOKAFKA_NO_EXTENSIONS: "1"
121121

122122
- name: Upload coverage to Codecov
123-
uses: codecov/codecov-action@v1
123+
uses: codecov/codecov-action@v4
124124
with:
125125
file: ./coverage-ext.xml
126126
flags: unit,cext
127127
name: test-windows-${{ matrix.python }}-ext
128128
if: ${{ always() }}
129129

130130
- name: Upload coverage to Codecov
131-
uses: codecov/codecov-action@v1
131+
uses: codecov/codecov-action@v4
132132
with:
133133
file: ./coverage-py.xml
134134
flags: unit,purepy
@@ -144,11 +144,11 @@ jobs:
144144
python: ["3.9", "3.10", "3.11", "3.12", "3.13"]
145145

146146
steps:
147-
- uses: actions/checkout@v2
147+
- uses: actions/checkout@v4
148148
with:
149149
ref: ${{ github.event.pull_request.head.sha }}
150150
- name: Set up Python
151-
uses: actions/setup-python@v2
151+
uses: actions/setup-python@v5
152152
with:
153153
python-version: ${{ matrix.python }}
154154

@@ -159,7 +159,7 @@ jobs:
159159
echo "::set-output name=dir::$(pip cache dir)"
160160
161161
- name: Cache packages
162-
uses: actions/cache@v1
162+
uses: actions/cache@v4
163163
with:
164164
path: ${{ steps.pip-cache.outputs.dir }}
165165
key: ${{ runner.os }}-py-${{ matrix.python }}-${{ hashFiles('requirements-ci.txt') }}-${{ hashFiles('setup.py') }}
@@ -188,15 +188,15 @@ jobs:
188188
AIOKAFKA_NO_EXTENSIONS: "1"
189189

190190
- name: Upload coverage to Codecov
191-
uses: codecov/codecov-action@v1
191+
uses: codecov/codecov-action@v4
192192
with:
193193
file: ./coverage-ext.xml
194194
flags: unit,cext
195195
name: test-mac-${{ matrix.python }}-ext
196196
if: ${{ always() }}
197197

198198
- name: Upload coverage to Codecov
199-
uses: codecov/codecov-action@v1
199+
uses: codecov/codecov-action@v4
200200
with:
201201
file: ./coverage-py.xml
202202
flags: unit,purepy
@@ -265,11 +265,11 @@ jobs:
265265
fail-fast: false
266266

267267
steps:
268-
- uses: actions/checkout@v2
268+
- uses: actions/checkout@v4
269269
with:
270270
ref: ${{ github.event.pull_request.head.sha }}
271271
- name: Set up Python
272-
uses: actions/setup-python@v2
272+
uses: actions/setup-python@v5
273273
with:
274274
python-version: ${{ matrix.python }}
275275

@@ -285,7 +285,7 @@ jobs:
285285
echo "::set-output name=dir::$(pip cache dir)"
286286
287287
- name: Cache packages
288-
uses: actions/cache@v1
288+
uses: actions/cache@v4
289289
with:
290290
path: ${{ steps.pip-cache.outputs.dir }}
291291
key: ${{ runner.os }}-py-${{ matrix.python }}-${{ hashFiles('requirements-ci.txt') }}-${{ hashFiles('setup.py') }}
@@ -317,15 +317,15 @@ jobs:
317317
KAFKA_VERSION: ${{ matrix.kafka }}
318318

319319
- name: Upload coverage to Codecov
320-
uses: codecov/codecov-action@v1
320+
uses: codecov/codecov-action@v4
321321
with:
322322
file: ./coverage-ext.xml
323323
flags: integration,cext
324324
name: test-linux-${{ matrix.python }}-${{ matrix.kafka }}-${{ matrix.scala }}-ext
325325
if: ${{ always() }}
326326

327327
- name: Upload coverage without cext to Codecov
328-
uses: codecov/codecov-action@v1
328+
uses: codecov/codecov-action@v4
329329
with:
330330
file: ./coverage-py.xml
331331
flags: integration,purepy

0 commit comments

Comments
 (0)