Skip to content

Commit 90ce7e8

Browse files
texodustexodus
committed
Move to Windows 2025 CI
Signed-off-by: Andrew Stein <steinlink@gmail.com>
1 parent dea836b commit 90ce7e8

File tree

4 files changed

+26
-26
lines changed

4 files changed

+26
-26
lines changed

‎.github/workflows/build.yaml‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ jobs:
187187
- ubuntu-22.04
188188
- ubuntu-22.04-arm
189189
- macos-14
190-
- windows-2022
190+
- windows-2025
191191
arch:
192192
- aarch64
193193
- x86_64
@@ -204,15 +204,15 @@ jobs:
204204
python-version: 3.11
205205
container: quay.io/pypa/manylinux_2_28_aarch64
206206
is-release:
207-
- ${{ startsWith(github.ref, 'refs/tags/v') || github.ref_name == 'master' }}
207+
- ${{ startsWith(github.ref, 'refs/tags/v') || github.ref_name == 'master' || github.event.inputs.ci-full }}
208208
exclude:
209-
- os: windows-2022
209+
- os: windows-2025
210210
arch: aarch64
211211
- os: macos-14
212212
is-release: false
213213
- os: macos-14
214214
arch: x86_64
215-
- os: windows-2022
215+
- os: windows-2025
216216
is-release: false
217217
- os: ubuntu-22.04
218218
arch: aarch64
@@ -302,14 +302,14 @@ jobs:
302302
matrix:
303303
os:
304304
- ubuntu-22.04
305-
- windows-2022
305+
- windows-2025
306306
arch:
307307
- x86_64
308308
node-version: [22.x]
309309
is-release:
310-
- ${{ startsWith(github.ref, 'refs/tags/v') || github.ref_name == 'master' }}
310+
- ${{ startsWith(github.ref, 'refs/tags/v') || github.ref_name == 'master' || github.event.inputs.ci-full }}
311311
exclude:
312-
- os: windows-2022
312+
- os: windows-2025
313313
is-release: false
314314
steps:
315315
- name: Checkout
@@ -504,25 +504,25 @@ jobs:
504504
os:
505505
- ubuntu-22.04
506506
- macos-14
507-
- windows-2022
507+
- windows-2025
508508
arch:
509509
- aarch64
510510
- x86_64
511511
python-version:
512512
- 3.11
513513
node-version: [22.x]
514514
is-release:
515-
- ${{ startsWith(github.ref, 'refs/tags/v') || github.ref_name == 'master' }}
515+
- ${{ startsWith(github.ref, 'refs/tags/v') || github.ref_name == 'master' || github.event.inputs.ci-full }}
516516
exclude:
517-
- os: windows-2022
517+
- os: windows-2025
518518
arch: aarch64
519519
- os: ubuntu-22.04
520520
arch: aarch64
521521
- os: macos-14
522522
is-release: false
523523
- os: macos-14
524524
arch: x86_64
525-
- os: windows-2022
525+
- os: windows-2025
526526
is-release: false
527527

528528
steps:
@@ -667,7 +667,7 @@ jobs:
667667
- ubuntu-22.04
668668
- ubuntu-22.04-arm
669669
- macos-14
670-
- windows-2022
670+
- windows-2025
671671
arch:
672672
- x86_64
673673
- aarch64
@@ -676,19 +676,19 @@ jobs:
676676
# - 3.11
677677
node-version: [22.x]
678678
is-release:
679-
- ${{ startsWith(github.ref, 'refs/tags/v') || github.ref_name == 'master' }}
679+
- ${{ startsWith(github.ref, 'refs/tags/v') || github.ref_name == 'master' || github.event.inputs.ci-full }}
680680
exclude:
681681
- os: macos-14
682682
is-release: false
683683
- os: macos-14
684684
is-release: false
685-
- os: windows-2022
685+
- os: windows-2025
686686
is-release: false
687687
- os: macos-14
688688
arch: aarch64
689689
- os: macos-14
690690
arch: x86_64
691-
- os: windows-2022
691+
- os: windows-2025
692692
arch: aarch64
693693
- os: ubuntu-22.04
694694
arch: aarch64
@@ -722,7 +722,7 @@ jobs:
722722
# PSP_USE_CCACHE: 1
723723

724724
test_python_sdist:
725-
if: startsWith(github.ref, 'refs/tags/v') || github.ref_name == 'master'
725+
if: startsWith(github.ref, 'refs/tags/v') || github.ref_name == 'master' || github.event.inputs.ci-full
726726
needs: [build_and_test_jupyterlab, build_and_test_rust]
727727
runs-on: ${{ matrix.os }}
728728
strategy:
@@ -816,7 +816,7 @@ jobs:
816816
# `-'
817817
benchmark_python:
818818
needs: [build_python, build_js]
819-
if: startsWith(github.ref, 'refs/tags/v') || github.ref_name == 'master'
819+
if: startsWith(github.ref, 'refs/tags/v') || github.ref_name == 'master' || github.event.inputs.ci-full
820820
runs-on: ${{ matrix.os }}
821821
strategy:
822822
fail-fast: false
@@ -876,7 +876,7 @@ jobs:
876876
# `--' '
877877
benchmark_js:
878878
needs: [build_js]
879-
if: startsWith(github.ref, 'refs/tags/v') || github.ref_name == 'master'
879+
if: startsWith(github.ref, 'refs/tags/v') || github.ref_name == 'master' || github.event.inputs.ci-full
880880
strategy:
881881
matrix:
882882
os: [ubuntu-22.04]
@@ -933,7 +933,7 @@ jobs:
933933
build_and_test_rust,
934934
lint_and_docs,
935935
]
936-
if: startsWith(github.ref, 'refs/tags/v') || github.ref_name == 'master'
936+
if: startsWith(github.ref, 'refs/tags/v') || github.ref_name == 'master' || github.event.inputs.ci-full
937937
strategy:
938938
matrix:
939939
os: [ubuntu-22.04]
@@ -973,7 +973,7 @@ jobs:
973973

974974
- uses: actions/download-artifact@v4
975975
with:
976-
name: perspective-python-dist-x86_64-windows-2022-3.11
976+
name: perspective-python-dist-x86_64-windows-2025-3.11
977977

978978
- uses: actions/download-artifact@v4
979979
with:

‎Cargo.lock‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎rust/perspective-client/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ path = "src/rust/lib.rs"
6262
prost-build = { version = "0.12.3" }
6363

6464
# https://github.com/abseil/abseil-cpp/issues/1241#issuecomment-2138616329
65-
protobuf-src = { version = "=2.0.1", optional = true }
65+
protobuf-src = { version = "2.1.1", optional = true }
6666

6767
[dependencies]
6868
async-lock = { version = "2.5.0" }

‎rust/perspective-server/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ disable-cpp = []
4242
cmake = "0.1.50"
4343
num_cpus = "^1.15.0"
4444
shlex = "1.3.0"
45-
protobuf-src = { version = "2.0.1" }
45+
protobuf-src = { version = "2.1.1" }
4646

4747
[dependencies]
4848
perspective-client = { version = "4.2.0" }

0 commit comments

Comments
 (0)