Skip to content

Commit c13db53

Browse files
authored
feat: support windows 2025 runners (#12)
1 parent 85cec5f commit c13db53

4 files changed

Lines changed: 52 additions & 16 deletions

File tree

.github/workflows/main.yml

Lines changed: 42 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,15 @@ jobs:
3232
run: npm run fmt-check
3333
- name: Run lint check
3434
run: npm run lint
35+
- name: Run bundle
36+
run: npm run bundle
37+
- name: Compare the expected and actual dist/ directories
38+
run: |
39+
if [ "$(git diff --ignore-space-at-eol dist/ | wc -l)" -gt "0" ]; then
40+
echo "Detected uncommitted changes after build. See status below:"
41+
git diff --text -v
42+
exit 1
43+
fi
3544
3645
audit:
3746
runs-on: ubuntu-latest
@@ -42,15 +51,23 @@ jobs:
4251
- run: npm audit --audit-level moderate --omit dev
4352

4453
test-defaults:
45-
runs-on: windows-2022
54+
strategy:
55+
fail-fast: false
56+
matrix:
57+
runner: [ windows-2022, windows-2025 ]
58+
runs-on: ${{ matrix.runner }}
4659
steps:
4760
- name: Check out source code
4861
uses: actions/checkout@v4
4962
- name: Setup Dev Drive
5063
uses: ./
5164

5265
test-declare-inputs:
53-
runs-on: windows-2022
66+
strategy:
67+
fail-fast: false
68+
matrix:
69+
runner: [ windows-2022, windows-2025 ]
70+
runs-on: ${{ matrix.runner }}
5471
steps:
5572
- name: Check out source code
5673
uses: actions/checkout@v4
@@ -71,9 +88,10 @@ jobs:
7188
strategy:
7289
fail-fast: false
7390
matrix:
91+
runner: [ windows-2022, windows-2025 ]
7492
drive-format: [ FAT, FAT32, exFAT, NTFS, ReFS ]
7593
with-mount-path: [ true, false ]
76-
runs-on: windows-2022
94+
runs-on: ${{ matrix.runner }}
7795
steps:
7896
- name: Check out source code
7997
uses: actions/checkout@v4
@@ -83,14 +101,17 @@ jobs:
83101
drive-format: ${{ matrix.drive-format }}
84102
# This should fall back to Drive Letter on unsupported drive formats.
85103
mount-path: ${{ matrix.with-mount-path && 'mount' || '' }}
104+
# Ensure we test FS directly
105+
native-dev-drive: false
86106

87107
test-large-size:
88108
strategy:
89109
fail-fast: false
90110
matrix:
111+
runner: [ windows-2022, windows-2025 ]
91112
drive-type: [ Fixed, Dynamic ]
92113
with-mount-path: [ true, false ]
93-
runs-on: windows-2022
114+
runs-on: ${{ matrix.runner }}
94115
steps:
95116
- name: Check out source code
96117
uses: actions/checkout@v4
@@ -106,8 +127,9 @@ jobs:
106127
strategy:
107128
fail-fast: false
108129
matrix:
130+
runner: [ windows-2022, windows-2025 ]
109131
with-mount-path: [ true, false ]
110-
runs-on: windows-2022
132+
runs-on: ${{ matrix.runner }}
111133
steps:
112134
- name: Check out source code
113135
uses: actions/checkout@v4
@@ -126,9 +148,10 @@ jobs:
126148
strategy:
127149
fail-fast: false
128150
matrix:
151+
runner: [ windows-2022, windows-2025 ]
129152
is-relative: [ true, false ]
130153
drive-format: [ ReFS, NTFS ]
131-
runs-on: windows-2022
154+
runs-on: ${{ matrix.runner }}
132155
steps:
133156
- name: Check out source code
134157
uses: actions/checkout@v4
@@ -146,9 +169,10 @@ jobs:
146169
strategy:
147170
fail-fast: false
148171
matrix:
172+
runner: [ windows-2022, windows-2025 ]
149173
with-mount-path: [ true, false ]
150174
workspace-copy: [ true ]
151-
runs-on: windows-2022
175+
runs-on: ${{ matrix.runner }}
152176
steps:
153177
- name: Check out source code
154178
uses: actions/checkout@v4
@@ -173,9 +197,10 @@ jobs:
173197
strategy:
174198
fail-fast: false
175199
matrix:
200+
runner: [ windows-2022, windows-2025 ]
176201
with-mount-path: [ true, false ]
177202
workspace-copy: [ true, false ]
178-
runs-on: windows-2022
203+
runs-on: ${{ matrix.runner }}
179204
steps:
180205
- name: Check out source code
181206
uses: actions/checkout@v4
@@ -248,8 +273,9 @@ jobs:
248273
strategy:
249274
fail-fast: false
250275
matrix:
276+
runner: [ windows-2022, windows-2025 ]
251277
with-mount-path: [ true, false ]
252-
runs-on: windows-2022
278+
runs-on: ${{ matrix.runner }}
253279
steps:
254280
- name: Check out source code
255281
uses: actions/checkout@v4
@@ -279,8 +305,9 @@ jobs:
279305
strategy:
280306
fail-fast: false
281307
matrix:
308+
runner: [ windows-2022, windows-2025 ]
282309
with-mount-path: [ true, false ]
283-
runs-on: windows-2022
310+
runs-on: ${{ matrix.runner }}
284311
needs: [test-cache-storage]
285312
steps:
286313
- name: Check out source code
@@ -306,7 +333,11 @@ jobs:
306333
}
307334
308335
test-env-mapping:
309-
runs-on: windows-2022
336+
strategy:
337+
fail-fast: false
338+
matrix:
339+
runner: [ windows-2022, windows-2025 ]
340+
runs-on: ${{ matrix.runner }}
310341
steps:
311342
- name: Check out source code
312343
uses: actions/checkout@v4

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
# 3.3.0
2+
3+
* Add `windows-2025` runner support.
4+
* Change default VHDX size to 2GB.
5+
16
# 3.2.0
27

38
* Add `env-mapping` option to support improved environment variables configuration.

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ You can optionally pass parameters to the action as follows:
3939
```yaml
4040
- uses: samypr100/setup-dev-drive@v3
4141
with:
42-
# Drive size in bytes (or as a PowerShell numeric literal). Defaults to 1GB.
43-
drive-size: 1GB
42+
# Drive size in bytes (or as a PowerShell numeric literal). Defaults to 2GB.
43+
drive-size: 2GB
4444
# Drive file system (ReFS, NTFS, etc.). Defaults to ReFS.
4545
drive-format: ReFS
4646
# Drive allocation (Dynamic or Fixed). Defaults to Dynamic.
@@ -68,15 +68,15 @@ For more examples, take a look in the dedicated [examples section](#examples).
6868

6969
### *drive-size*
7070

71-
By default, this option is set to `1GB`.
71+
By default, this option is set to `2GB`.
7272

7373
Allows you to configure the dev drive size in bytes. This is subject to the limit of space
7474
available on your runner. The default public runners roughly hold about 15GB of
7575
[space](https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners#standard-github-hosted-runners-for-public-repositories),
7676
so it's suggested you keep your drive size below that limit, or you may encounter errors.
7777

7878
You can use PowerShell built in [Numeric Literals](https://learn.microsoft.com/en-us/powershell/module/microsoft.powershell.core/about/about_numeric_literals)
79-
functionality to automatically expand expressions like `1GB` to mean `1073741824`.
79+
functionality to automatically expand expressions like `2GB` to mean `2147483648`.
8080

8181
### *drive-format*
8282

action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ branding:
77
inputs:
88
drive-size:
99
description: "Drive Size. Examples: 1GB, 3GB, 10GB."
10-
default: "1GB"
10+
default: "2GB"
1111
drive-format:
1212
description: "Drive Format. Examples: FAT, FAT32, exFAT, NTFS, ReFS."
1313
default: "ReFS"

0 commit comments

Comments
 (0)