Skip to content

Commit 0743ccc

Browse files
authored
Merge pull request #5740 from unisonweb/fix/windows-2022-to-2025
try replacing windows 2022 with 2025
2 parents e1c9990 + eecef2f commit 0743ccc

File tree

5 files changed

+13
-16
lines changed

5 files changed

+13
-16
lines changed

.github/workflows/bundle-ucm.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
strategy:
2626
fail-fast: false
2727
matrix:
28-
os: [ubuntu-24.04, macos-13, macos-14, windows-2022]
28+
os: [ubuntu-24.04, macos-13, macos-14, windows-2025]
2929
runs-on: ${{matrix.os}}
3030
steps:
3131
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
@@ -152,7 +152,7 @@ jobs:
152152
- ubuntu-24.04
153153
- macos-13
154154
- macos-14
155-
- windows-2022
155+
- windows-2025
156156
runs-on: ${{matrix.os}}
157157
steps:
158158
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
@@ -209,7 +209,7 @@ jobs:
209209
strategy:
210210
fail-fast: false
211211
matrix:
212-
os: [ubuntu-24.04, macos-13, macos-14, windows-2022]
212+
os: [ubuntu-24.04, macos-13, macos-14, windows-2025]
213213
steps:
214214
- name: set up environment
215215
run: |

.github/workflows/ci-build-jit-binary.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
strategy:
1919
fail-fast: false
2020
matrix:
21-
os: [ubuntu-24.04, macos-13, windows-2022]
21+
os: [ubuntu-24.04, macos-13, windows-2025]
2222
runs-on: ${{matrix.os}}
2323
steps:
2424
- name: set up environment

.github/workflows/ci-test-jit.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
os:
2626
- ubuntu-24.04
2727
- macos-13
28-
# - windows-2022
28+
# - windows-2025
2929
runs-on: ${{matrix.os}}
3030
steps:
3131
- name: set up environment

.github/workflows/ci.yaml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,7 @@ jobs:
4646
# While iterating on this file, you can disable one or more of these to speed things up
4747
- ubuntu-24.04
4848
- macos-13
49-
- windows-2022
50-
# - windows-2022
49+
- windows-2025
5150
steps:
5251
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
5352

@@ -199,8 +198,7 @@ jobs:
199198
# While iterating on this file, you can disable one or more of these to speed things up
200199
- ubuntu-24.04
201200
- macos-13
202-
- windows-2022
203-
# - windows-2022
201+
- windows-2025
204202
steps:
205203
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
206204
- name: tweak environment
@@ -282,8 +280,7 @@ jobs:
282280
# While iterating on this file, you can disable one or more of these to speed things up
283281
- ubuntu-24.04
284282
- macos-13
285-
# - windows-2022
286-
# - windows-2022
283+
# - windows-2025
287284
steps:
288285
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
289286
- name: tweak environment

.mergify.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@ pull_request_rules:
44
- check-success=check-contributor
55
- check-success=build ucm (ubuntu-20.04)
66
- check-success=build ucm (macos-13)
7-
- check-success=build ucm (windows-2022)
7+
- check-success=build ucm (windows-2025)
88
- check-success=run transcripts (ubuntu-20.04)
99
- check-success=run transcripts (macos-13)
10-
- check-success=run transcripts (windows-2022)
10+
- check-success=run transcripts (windows-2025)
1111
- check-success=run interpreter tests (ubuntu-20.04)
1212
- check-success=run interpreter tests (macos-13)
13-
# - check-success=run interpreter tests (windows-2022)
13+
# - check-success=run interpreter tests (windows-2025)
1414
- check-success=generate jit source
1515
- check-success=build jit binary / build jit binary (ubuntu-20.04)
1616
- check-success=build jit binary / build jit binary (macos-13)
17-
- check-success=build jit binary / build jit binary (windows-2022)
17+
- check-success=build jit binary / build jit binary (windows-2025)
1818
- check-success=test jit / test jit (ubuntu-20.04)
1919
- check-success=test jit / test jit (macos-13)
20-
# - check-success=test jit / test jit (windows-2022)
20+
# - check-success=test jit / test jit (windows-2025)
2121
- label=ready-to-merge
2222
- "#approved-reviews-by>=1"
2323
actions:

0 commit comments

Comments
 (0)