Skip to content

Commit 70bddea

Browse files
committed
Workflow update
1 parent 4225930 commit 70bddea

File tree

2 files changed

+28
-20
lines changed

2 files changed

+28
-20
lines changed

.github/workflows/pypi.yml

+27-19
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919

2020
steps:
2121
- name: Check out repository
22-
uses: actions/checkout@v3
22+
uses: actions/checkout@v4
2323

2424
- name: Build and Install VCL
2525
run: |
@@ -38,33 +38,35 @@ jobs:
3838
3939
- name: Cache Stubs
4040
id: cache-stubs
41-
uses: actions/cache@v3
41+
uses: actions/cache@v4
4242
with:
4343
path: .\delphivcl\__init__.pyi
44-
key: ${{ runner.os }}-stubs
44+
key: ${{ runner.os }}-cache-${{ hashFiles('.\delphivcl\*') }}
4545

4646
build_wheels_win_32:
4747
name: Build Windows x86 wheels for Python ${{ matrix.python }}
4848
needs: [build_stubs]
4949
runs-on: ${{ matrix.os }}
5050
strategy:
5151
matrix:
52-
python: ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11']
52+
python: ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
5353
include:
5454
- os: [windows-latest]
5555
arch: ["x86"]
5656
steps:
5757
- name: Check out repository
58-
uses: actions/checkout@v3
58+
uses: actions/checkout@v4
5959
with:
6060
fetch-depth: 0
6161

6262
- name: Restore Cached Stubs
6363
id: cache-stubs
64-
uses: actions/cache@v3
64+
uses: actions/cache@v4
6565
with:
6666
path: .\delphivcl\__init__.pyi
67-
key: ${{ runner.os }}-stubs
67+
key: ${{ runner.os }}-cache-${{ hashFiles('.\delphivcl\*') }}
68+
restore-keys: |
69+
${{ runner.os }}-cache-
6870
6971
- name: Set up Python ${{ matrix.python }}
7072
uses: actions/setup-python@v3
@@ -79,18 +81,19 @@ jobs:
7981
python setup.py bdist_wheel --plat-name=win32
8082
8183
- name: Save wheel
82-
uses: actions/upload-artifact@v2
84+
uses: actions/upload-artifact@v4
8385
with:
86+
name: artifacts-win32-${{ matrix.python }}
8487
path: dist/*.whl
85-
if-no-files-found: error
88+
if-no-files-found: error
8689

8790
build_wheels_win_64:
8891
name: Build Windows x64 wheels for Python ${{ matrix.python }}
8992
needs: [build_stubs]
9093
runs-on: ${{ matrix.os }}
9194
strategy:
9295
matrix:
93-
python: ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11']
96+
python: ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
9497
include:
9598
- os: [windows-latest]
9699
arch: ["AMD64"]
@@ -102,10 +105,12 @@ jobs:
102105

103106
- name: Restore Cached Stubs
104107
id: cache-stubs
105-
uses: actions/cache@v3
108+
uses: actions/cache@v4
106109
with:
107110
path: .\delphivcl\__init__.pyi
108-
key: ${{ runner.os }}-stubs
111+
key: ${{ runner.os }}-cache-${{ hashFiles('.\delphivcl\*') }}
112+
restore-keys: |
113+
${{ runner.os }}-cache-
109114
110115
- name: Set up Python ${{ matrix.python }}
111116
uses: actions/setup-python@v3
@@ -114,16 +119,17 @@ jobs:
114119
architecture: "x64"
115120

116121
- name: Build bdist wheel
117-
run: |
122+
run: |
118123
python -m pip install setuptools --upgrade
119124
python -m pip install wheel --upgrade
120125
python setup.py bdist_wheel --plat-name=win_amd64
121126
122127
- name: Save wheel
123-
uses: actions/upload-artifact@v2
128+
uses: actions/upload-artifact@v4
124129
with:
130+
name: artifacts-win64-${{ matrix.python }}
125131
path: dist/*.whl
126-
if-no-files-found: error
132+
if-no-files-found: error
127133

128134
upload_pypi_test:
129135
name: Upload to PyPI test
@@ -136,10 +142,11 @@ jobs:
136142
id-token: write
137143
if: github.ref == 'refs/heads/main'
138144
steps:
139-
- uses: actions/download-artifact@v2
145+
- uses: actions/download-artifact@v4
140146
with:
141-
name: artifact
147+
pattern: artifacts-*
142148
path: dist
149+
merge-multiple: true
143150

144151
- name: Publish package to TestPyPI
145152
uses: pypa/gh-action-pypi-publish@release/v1
@@ -157,10 +164,11 @@ jobs:
157164
id-token: write
158165
if: startsWith(github.ref, 'refs/tags/v')
159166
steps:
160-
- uses: actions/download-artifact@v2
167+
- uses: actions/download-artifact@v4
161168
with:
162-
name: artifact
169+
pattern: artifacts-*
163170
path: dist
171+
merge-multiple: true
164172

165173
- name: Publish package to PyPI
166174
uses: pypa/gh-action-pypi-publish@release/v1

.github/workflows/tests.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
config:
1818
- { os: windows-latest, arch: AMD64, python-arch: x64, name: windows-latest-x64 }
1919
- { os: windows-latest, arch: x86, python-arch: x86, name: windows-latest-x86 }
20-
python: ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11']
20+
python: ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11', '3.12']
2121
steps:
2222
- name: Check out repository
2323
uses: actions/checkout@v3

0 commit comments

Comments
 (0)