Visitar URL original
Change Alpine-3.17 wslId to contain the version · Vampire/setup-wsl@4e9c3b1 · GitHub
Skip to content

Commit 4e9c3b1

Browse files
VampireVampire
committed
Change Alpine-3.17 wslId to contain the version
1 parent 0dc99a1 commit 4e9c3b1

3 files changed

Lines changed: 11 additions & 13 deletions

File tree

‎.github/workflows/test.main.kts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,7 @@ val alpine318 = Distribution(
109109
)
110110

111111
val alpine317 = Distribution(
112-
wslId = "Alpine",
113-
userId = "Alpine-3.17",
112+
wslId = "Alpine-3.17",
114113
matchPattern = "*Alpine*3.17*",
115114
defaultAbsentTool = "dos2unix",
116115
createTestUserCommand = "adduser -D test"

‎.github/workflows/test.yaml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,7 @@ jobs:
419419
match-pattern: '*Alpine*3.18*'
420420
default-absent-tool: 'dos2unix'
421421
create-test-user-command: 'adduser -D test'
422-
- wsl-id: 'Alpine'
422+
- wsl-id: 'Alpine-3.17'
423423
user-id: 'Alpine-3.17'
424424
match-pattern: '*Alpine*3.17*'
425425
default-absent-tool: 'dos2unix'
@@ -992,7 +992,7 @@ jobs:
992992
match-pattern: '*Alpine*3.18*'
993993
default-absent-tool: 'dos2unix'
994994
create-test-user-command: 'adduser -D test'
995-
- wsl-id: 'Alpine'
995+
- wsl-id: 'Alpine-3.17'
996996
user-id: 'Alpine-3.17'
997997
match-pattern: '*Alpine*3.17*'
998998
default-absent-tool: 'dos2unix'
@@ -1155,7 +1155,7 @@ jobs:
11551155
match-pattern: '*Alpine*3.18*'
11561156
default-absent-tool: 'dos2unix'
11571157
create-test-user-command: 'adduser -D test'
1158-
- wsl-id: 'Alpine'
1158+
- wsl-id: 'Alpine-3.17'
11591159
user-id: 'Alpine-3.17'
11601160
match-pattern: '*Alpine*3.17*'
11611161
default-absent-tool: 'dos2unix'
@@ -1356,7 +1356,7 @@ jobs:
13561356
match-pattern: '*Alpine*3.18*'
13571357
default-absent-tool: 'dos2unix'
13581358
create-test-user-command: 'adduser -D test'
1359-
- wsl-id: 'Alpine'
1359+
- wsl-id: 'Alpine-3.17'
13601360
user-id: 'Alpine-3.17'
13611361
match-pattern: '*Alpine*3.17*'
13621362
default-absent-tool: 'dos2unix'
@@ -1503,7 +1503,7 @@ jobs:
15031503
match-pattern: '*Alpine*3.18*'
15041504
default-absent-tool: 'dos2unix'
15051505
create-test-user-command: 'adduser -D test'
1506-
- wsl-id: 'Alpine'
1506+
- wsl-id: 'Alpine-3.17'
15071507
user-id: 'Alpine-3.17'
15081508
match-pattern: '*Alpine*3.17*'
15091509
default-absent-tool: 'dos2unix'
@@ -1694,7 +1694,7 @@ jobs:
16941694
match-pattern: '*Alpine*3.18*'
16951695
default-absent-tool: 'dos2unix'
16961696
create-test-user-command: 'adduser -D test'
1697-
- wsl-id: 'Alpine'
1697+
- wsl-id: 'Alpine-3.17'
16981698
user-id: 'Alpine-3.17'
16991699
match-pattern: '*Alpine*3.17*'
17001700
default-absent-tool: 'dos2unix'
@@ -2005,7 +2005,7 @@ jobs:
20052005
match-pattern: '*Alpine*3.18*'
20062006
default-absent-tool: 'dos2unix'
20072007
create-test-user-command: 'adduser -D test'
2008-
- wsl-id: 'Alpine'
2008+
- wsl-id: 'Alpine-3.17'
20092009
user-id: 'Alpine-3.17'
20102010
match-pattern: '*Alpine*3.17*'
20112011
default-absent-tool: 'dos2unix'
@@ -2318,7 +2318,7 @@ jobs:
23182318
default-absent-tool: 'dos2unix'
23192319
create-test-user-command: 'adduser -D test'
23202320
distribution7:
2321-
wsl-id: 'Alpine'
2321+
wsl-id: 'Alpine-3.17'
23222322
user-id: 'Alpine-3.17'
23232323
match-pattern: '*Alpine*3.17*'
23242324
default-absent-tool: 'dos2unix'
@@ -2415,7 +2415,7 @@ jobs:
24152415
default-absent-tool: 'dos2unix'
24162416
create-test-user-command: 'adduser -D test'
24172417
distribution7:
2418-
wsl-id: 'Alpine'
2418+
wsl-id: 'Alpine-3.17'
24192419
user-id: 'Alpine-3.17'
24202420
match-pattern: '*Alpine*3.17*'
24212421
default-absent-tool: 'dos2unix'

‎src/jsMain/kotlin/net/kautler/github/action/setup_wsl/Distribution.kt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -503,8 +503,7 @@ abstract class AlpineDistribution : ApkBasedDistribution {
503503
}
504504

505505
object Alpine317 : AlpineDistribution(
506-
wslId = "Alpine",
507-
userId = "Alpine-3.17",
506+
wslId = "Alpine-3.17",
508507
distributionName = "Alpine",
509508
version = SemVer("3.17.10"),
510509
downloadUrl = URL("https://dl-cdn.alpinelinux.org/alpine/v3.17/releases/x86_64/alpine-minirootfs-3.17.10-x86_64.tar.gz")

0 commit comments

Comments
 (0)