Skip to content

Commit 6113e1e

Browse files
committed
CI deps update and add support python 3.14 and 3.15
1 parent d0b4177 commit 6113e1e

6 files changed

Lines changed: 32 additions & 30 deletions

File tree

.github/workflows/cd.yml

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
permissions:
1616
actions: write
1717
steps:
18-
- uses: styfle/cancel-workflow-action@0.12.1
18+
- uses: styfle/cancel-workflow-action@0.13.1
1919
with:
2020
access_token: ${{ github.token }}
2121

@@ -24,7 +24,7 @@ jobs:
2424
runs-on: ubuntu-latest
2525
name: Test Ubuntu
2626
steps:
27-
- uses: actions/checkout@v4
27+
- uses: actions/checkout@v6
2828
- name: Install Dependencies
2929
run: .github/scripts/install-ubuntu.sh
3030
- name: Build & Test
@@ -35,7 +35,7 @@ jobs:
3535
runs-on: windows-2022
3636
name: Test Windows
3737
steps:
38-
- uses: actions/checkout@v4
38+
- uses: actions/checkout@v6
3939
- name: Install Dependencies
4040
run: .github/scripts/install-windows.sh
4141
shell: bash
@@ -48,7 +48,7 @@ jobs:
4848
runs-on: macos-latest
4949
name: Test macOS
5050
steps:
51-
- uses: actions/checkout@v4
51+
- uses: actions/checkout@v6
5252
- name: Install Dependencies
5353
run: .github/scripts/install-macos.sh ci
5454
- name: Build & Test
@@ -59,15 +59,15 @@ jobs:
5959
name: Build Release Windows x86
6060
runs-on: windows-2022
6161
steps:
62-
- uses: actions/checkout@v4
62+
- uses: actions/checkout@v6
6363
- name: Install Dependencies
6464
run: .github/scripts/install-windows.sh
6565
shell: bash
6666
- name: Build & Test
6767
run: .github/scripts/build-windows.sh release
6868
shell: bash
6969
- name: Upload artifact
70-
uses: actions/upload-artifact@v4
70+
uses: actions/upload-artifact@v6
7171
with:
7272
name: windows_single_core_x86
7373
path: build/bin/RelWithDebInfo/solvespace_single_core_x86.exe
@@ -77,15 +77,15 @@ jobs:
7777
name: Build Release Windows (OpenMP) x86
7878
runs-on: windows-2022
7979
steps:
80-
- uses: actions/checkout@v4
80+
- uses: actions/checkout@v6
8181
- name: Install Dependencies
8282
run: .github/scripts/install-windows.sh
8383
shell: bash
8484
- name: Build & Test
8585
run: .github/scripts/build-windows.sh release openmp
8686
shell: bash
8787
- name: Upload artifact
88-
uses: actions/upload-artifact@v4
88+
uses: actions/upload-artifact@v6
8989
with:
9090
name: windows_x86
9191
path: build/bin/RelWithDebInfo/solvespace_x86.exe
@@ -95,15 +95,15 @@ jobs:
9595
name: Build Release Windows x64
9696
runs-on: windows-2022
9797
steps:
98-
- uses: actions/checkout@v4
98+
- uses: actions/checkout@v6
9999
- name: Install Dependencies
100100
run: .github/scripts/install-windows.sh
101101
shell: bash
102102
- name: Build & Test
103103
run: .github/scripts/build-windows.sh release not_openmp x64
104104
shell: bash
105105
- name: Upload artifact
106-
uses: actions/upload-artifact@v4
106+
uses: actions/upload-artifact@v6
107107
with:
108108
name: windows_single_core_x64
109109
path: build/bin/RelWithDebInfo/solvespace_single_core_x64.exe
@@ -113,15 +113,15 @@ jobs:
113113
name: Build Release Windows (OpenMP) x64
114114
runs-on: windows-2022
115115
steps:
116-
- uses: actions/checkout@v4
116+
- uses: actions/checkout@v6
117117
- name: Install Dependencies
118118
run: .github/scripts/install-windows.sh
119119
shell: bash
120120
- name: Build & Test
121121
run: .github/scripts/build-windows.sh release openmp x64
122122
shell: bash
123123
- name: Upload artifact
124-
uses: actions/upload-artifact@v4
124+
uses: actions/upload-artifact@v6
125125
with:
126126
name: windows_x64
127127
path: build/bin/RelWithDebInfo/solvespace_x64.exe
@@ -131,7 +131,7 @@ jobs:
131131
name: Build Release macOS
132132
runs-on: macos-latest
133133
steps:
134-
- uses: actions/checkout@v4
134+
- uses: actions/checkout@v6
135135
- name: Install Dependencies
136136
run: .github/scripts/install-macos.sh ci
137137
- name: Build & Test
@@ -145,7 +145,7 @@ jobs:
145145
MACOS_APPSTORE_USERNAME: ${{ secrets.MACOS_APPSTORE_USERNAME }}
146146
MACOS_DEVELOPER_ID: ${{ secrets.MACOS_DEVELOPER_ID }}
147147
- name: Upload artifact
148-
uses: actions/upload-artifact@v4
148+
uses: actions/upload-artifact@v6
149149
with:
150150
name: macos
151151
path: build/bin/SolveSpace.dmg
@@ -155,7 +155,7 @@ jobs:
155155
name: Build Release Web
156156
runs-on: ubuntu-latest
157157
steps:
158-
- uses: actions/checkout@v4
158+
- uses: actions/checkout@v6
159159
- name: Install Dependencies
160160
run: .github/scripts/install-web.sh
161161
- name: Build & Pack
@@ -164,7 +164,7 @@ jobs:
164164
cd build/bin
165165
rm *.a || true
166166
- name: Upload artifact
167-
uses: actions/upload-artifact@v4
167+
uses: actions/upload-artifact@v6
168168
with:
169169
name: solvespace_web
170170
path: build/bin/
@@ -174,7 +174,7 @@ jobs:
174174
# name: Deploy AMD64 Snap
175175
# runs-on: ubuntu-latest
176176
# steps:
177-
# - uses: actions/checkout@v4
177+
# - uses: actions/checkout@v6
178178
# - name: Fetch Tags
179179
# run: git fetch --force --tags
180180
# - name: Set Up Source
@@ -214,11 +214,9 @@ jobs:
214214
- name: Download All Workflow Artifacts
215215
uses: actions/download-artifact@v4
216216

217-
218217
- name: Create release
219218
uses: softprops/action-gh-release@v2
220219
with:
221-
222220
files: |
223221
windows_x86/solvespace_single_core_x86.exe
224222
windows_x86/solvespace_x86.exe

.github/workflows/python.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ jobs:
1111
name: python sdist
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v4
14+
- uses: actions/checkout@v6
1515
- run: git submodule update --init extlib/mimalloc extlib/eigen
16-
- uses: actions/setup-python@v3
16+
- uses: actions/setup-python@v6
1717
with:
1818
python-version: "3.10"
1919
- name: Pack
@@ -33,7 +33,7 @@ jobs:
3333
python -m pip install -U setuptools build
3434
python -m build --sdist
3535
- name: Upload artifact
36-
uses: actions/upload-artifact@v4
36+
uses: actions/upload-artifact@v6
3737
with:
3838
name: sdist
3939
path: dist/*.tar.gz
@@ -61,6 +61,8 @@ jobs:
6161
"311",
6262
"312",
6363
"313",
64+
"314",
65+
"315",
6466
]
6567
exclude:
6668
- os_arch: "macos-arm64"
@@ -105,7 +107,7 @@ jobs:
105107
cibuildwheel_architecture: "aarch64"
106108
architecture: "aarch64"
107109
steps:
108-
- uses: actions/checkout@v4
110+
- uses: actions/checkout@v6
109111
with:
110112
fetch-depth: 0
111113
- run: git submodule update --init extlib/mimalloc extlib/eigen
@@ -140,7 +142,7 @@ jobs:
140142
CMAKE_GENERATOR_PLATFORM="${{ matrix.cmake_generator_platform }}"
141143
CIBW_ENVIRONMENT_PASS_WINDOWS: "CMAKE_GENERATOR CMAKE_GENERATOR_PLATFORM"
142144
CIBW_ENVIRONMENT_MACOS: MACOSX_DEPLOYMENT_TARGET=10.12
143-
- uses: actions/upload-artifact@v4
145+
- uses: actions/upload-artifact@v6
144146
with:
145147
name: wheel-cp${{ matrix.python_version }}-${{ matrix.os_short }}-${{ matrix.architecture }}
146148
path: |

.github/workflows/source-tarball.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
name: Create & Upload Tarball
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v4
13+
- uses: actions/checkout@v6
1414
with:
1515
submodules: true
1616
fetch-depth: 0

.github/workflows/test.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: ubuntu-latest
1616
name: Test Ubuntu
1717
steps:
18-
- uses: actions/checkout@v4
18+
- uses: actions/checkout@v6
1919
- name: Install Dependencies
2020
run: .github/scripts/install-ubuntu.sh
2121
- name: Build & Test
@@ -25,7 +25,7 @@ jobs:
2525
runs-on: windows-2022
2626
name: Test Windows
2727
steps:
28-
- uses: actions/checkout@v4
28+
- uses: actions/checkout@v6
2929
- name: Install Dependencies
3030
run: .github/scripts/install-windows.sh
3131
shell: bash
@@ -37,7 +37,7 @@ jobs:
3737
runs-on: macos-latest
3838
name: Test macOS
3939
steps:
40-
- uses: actions/checkout@v4
40+
- uses: actions/checkout@v6
4141
- name: Install Dependencies
4242
run: .github/scripts/install-macos.sh ci
4343
- name: Build & Test
@@ -50,7 +50,7 @@ jobs:
5050
image: bilelmoussaoui/flatpak-github-actions:freedesktop-21.08
5151
options: --privileged
5252
steps:
53-
- uses: actions/checkout@v4
53+
- uses: actions/checkout@v6
5454
with:
5555
submodules: true
5656
fetch-depth: 0

.github/workflows/wasmlib.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
name: WASM library
1717
runs-on: ubuntu-latest
1818
steps:
19-
- uses: actions/checkout@v4
19+
- uses: actions/checkout@v6
2020
- run: git submodule update --init extlib/mimalloc extlib/eigen
2121
- name: Pack
2222
shell: bash

pyproject.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ classifiers = [
2222
"Programming Language :: Python :: 3.11",
2323
"Programming Language :: Python :: 3.12",
2424
"Programming Language :: Python :: 3.13",
25+
"Programming Language :: Python :: 3.14",
26+
"Programming Language :: Python :: 3.15",
2527
]
2628

2729
[tool.scikit-build]

0 commit comments

Comments
 (0)