Skip to content

Commit f4312b8

Browse files
odsods
committed
WIP: Update actions
1 parent 7133562 commit f4312b8

File tree

3 files changed

+60
-57
lines changed

3 files changed

+60
-57
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

+40-37
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
name: Publish
55

66
on:
7+
push:
8+
branches: [ "update-actions" ]
79
release:
810
types: [created]
911
workflow_dispatch: {}
@@ -12,8 +14,8 @@ jobs:
1214
package-source:
1315
runs-on: ubuntu-latest
1416
steps:
15-
- uses: actions/checkout@v2
16-
- uses: actions/setup-python@v2
17+
- uses: actions/checkout@v4
18+
- uses: actions/setup-python@v5
1719
with:
1820
python-version: "3.9"
1921
- name: Prepare C files to include
@@ -25,9 +27,9 @@ jobs:
2527
- name: Build source package
2628
run: python -m build --sdist
2729
- name: Upload source package
28-
uses: actions/upload-artifact@v2
30+
uses: actions/upload-artifact@v4
2931
with:
30-
name: dist
32+
name: dist-source
3133
path: dist/
3234

3335
package-wheel:
@@ -49,17 +51,17 @@ jobs:
4951
- os: windows-latest
5052
arch: amd64
5153
steps:
52-
- uses: actions/checkout@v2
53-
- uses: actions/setup-python@v2
54+
- uses: actions/checkout@v4
55+
- uses: actions/setup-python@v5
5456
with:
5557
python-version: "3.9"
5658
- name: Set up QEMU
5759
if: ${{ matrix.arch == 'aarch64' }}
58-
uses: docker/setup-qemu-action@v1
60+
uses: docker/setup-qemu-action@v3
5961
- name: Build wheels
6062
env:
6163
CIBW_ARCHS_LINUX: ${{matrix.arch}}
62-
CIBW_BUILD: cp38-* cp39-* cp310-* cp311-* cp312-*
64+
CIBW_BUILD: cp39-* cp310-* cp311-* cp312-* cp313-*
6365
CIBW_SKIP: '*-musllinux*'
6466
CIBW_BEFORE_BUILD_LINUX: pip install -r requirements-cython.txt && yum install -y zlib-devel
6567
# On windows and mac we should have z library preinstalled
@@ -71,9 +73,9 @@ jobs:
7173
cibuildwheel --output-dir dist
7274
shell: bash
7375
- name: Upload wheels
74-
uses: actions/upload-artifact@v2
76+
uses: actions/upload-artifact@v4
7577
with:
76-
name: dist
78+
name: dist-${{ matrix.os }}-${{ matrix.arch }}
7779
path: dist/
7880

7981
test-wheels-windows:
@@ -96,14 +98,14 @@ jobs:
9698
aiokafka_whl: dist/aiokafka-*-cp313-cp313-win_amd64.whl
9799

98100
steps:
99-
- uses: actions/checkout@v2
101+
- uses: actions/checkout@v4
100102
- name: Download distributions
101-
uses: actions/download-artifact@v2
103+
uses: actions/download-artifact@v4
102104
with:
103-
name: dist
105+
name: dist-windows-latest-amd64
104106
path: dist/
105107
- name: Set up Python
106-
uses: actions/setup-python@v2
108+
uses: actions/setup-python@v5
107109
with:
108110
python-version: ${{ matrix.python }}
109111

@@ -141,14 +143,14 @@ jobs:
141143
aiokafka_whl: dist/aiokafka-*-cp313-cp313-macosx_*_x86_64.whl
142144

143145
steps:
144-
- uses: actions/checkout@v2
146+
- uses: actions/checkout@v4
145147
- name: Download distributions
146-
uses: actions/download-artifact@v2
148+
uses: actions/download-artifact@v4
147149
with:
148-
name: dist
150+
name: dist-macos-13-x86_64
149151
path: dist/
150152
- name: Set up Python
151-
uses: actions/setup-python@v2
153+
uses: actions/setup-python@v5
152154
with:
153155
python-version: ${{ matrix.python }}
154156

@@ -184,14 +186,14 @@ jobs:
184186
aiokafka_whl: dist/aiokafka-*-cp313-cp313-macosx_*_arm64.whl
185187

186188
steps:
187-
- uses: actions/checkout@v2
189+
- uses: actions/checkout@v4
188190
- name: Download distributions
189-
uses: actions/download-artifact@v2
191+
uses: actions/download-artifact@v4
190192
with:
191-
name: dist
193+
name: dist-macos-latest-arm64
192194
path: dist/
193195
- name: Set up Python
194-
uses: actions/setup-python@v2
196+
uses: actions/setup-python@v5
195197
with:
196198
python-version: ${{ matrix.python }}
197199

@@ -227,14 +229,14 @@ jobs:
227229
aiokafka_whl: dist/aiokafka-*-cp313-cp313-manylinux*_x86_64.whl
228230

229231
steps:
230-
- uses: actions/checkout@v2
232+
- uses: actions/checkout@v4
231233
- name: Download distributions
232-
uses: actions/download-artifact@v2
234+
uses: actions/download-artifact@v4
233235
with:
234-
name: dist
236+
name: dist-ubuntu-latest-x86_64
235237
path: dist/
236238
- name: Set up Python
237-
uses: actions/setup-python@v2
239+
uses: actions/setup-python@v5
238240
with:
239241
python-version: ${{ matrix.python }}
240242

@@ -264,8 +266,6 @@ jobs:
264266
strategy:
265267
matrix:
266268
include:
267-
- pyver: cp38-cp38
268-
aiokafka_whl: dist/aiokafka-*-cp38-cp38-manylinux*_aarch64.whl
269269
- pyver: cp39-cp39
270270
aiokafka_whl: dist/aiokafka-*-cp39-cp39-manylinux*_aarch64.whl
271271
- pyver: cp310-cp310
@@ -274,16 +274,18 @@ jobs:
274274
aiokafka_whl: dist/aiokafka-*-cp311-cp311-manylinux*_aarch64.whl
275275
- pyver: cp312-cp312
276276
aiokafka_whl: dist/aiokafka-*-cp312-cp312-manylinux*_aarch64.whl
277+
- pyver: cp313-cp313
278+
aiokafka_whl: dist/aiokafka-*-cp313-cp313-manylinux*_aarch64.whl
277279

278280
steps:
279-
- uses: actions/checkout@v2
281+
- uses: actions/checkout@v4
280282
- name: Set up QEMU
281283
id: qemu
282-
uses: docker/setup-qemu-action@v1
284+
uses: docker/setup-qemu-action@v3
283285
- name: Download distributions
284-
uses: actions/download-artifact@v2
286+
uses: actions/download-artifact@v4
285287
with:
286-
name: dist
288+
name: dist-ubuntu-latest-aarch64
287289
path: dist/
288290
- name: Test Wheel
289291
run: |
@@ -320,11 +322,12 @@ jobs:
320322
https://pypi.org/project/aiokafka/${{ github.ref_name }}
321323
322324
steps:
323-
- uses: actions/checkout@v2
325+
- uses: actions/checkout@v4
324326
- name: Download distributions
325-
uses: actions/download-artifact@v2
327+
uses: actions/download-artifact@v4
326328
with:
327-
name: dist
328329
path: dist/
329-
- name: Publish to PyPI
330-
uses: pypa/gh-action-pypi-publish@release/v1
330+
pattern: dist-*
331+
merge-multiple: true
332+
# - name: Publish to PyPI
333+
# uses: pypa/gh-action-pypi-publish@release/v1

‎.github/workflows/tests.yml

+19-19
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ name: Tests
55

66
on:
77
push:
8-
branches: [ master, '**' ]
8+
branches: [ never ]
99
tags:
1010
- "v0.[0-9]+.[0-9]+"
1111
- "v0.[0-9]+.[0-9]+.dev*"
@@ -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)