Skip to content

Commit 0dc99a1

Browse files
VampireVampire
committed
Remove deprecated Alpine
1 parent ab5ed27 commit 0dc99a1

7 files changed

Lines changed: 79 additions & 178 deletions

File tree

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

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -116,22 +116,14 @@ val alpine317 = Distribution(
116116
createTestUserCommand = "adduser -D test"
117117
)
118118

119-
val alpine = Distribution(
120-
wslId = "Alpine",
121-
matchPattern = "*Alpine*3.17*",
122-
defaultAbsentTool = "dos2unix",
123-
createTestUserCommand = "adduser -D test"
124-
)
125-
126119
val alpineDistributions = listOf(
127120
alpine323,
128121
alpine322,
129122
alpine321,
130123
alpine320,
131124
alpine319,
132125
alpine318,
133-
alpine317,
134-
alpine
126+
alpine317
135127
)
136128

137129
val debian13 = Distribution(

‎.github/workflows/test.yaml‎

Lines changed: 77 additions & 144 deletions
Large diffs are not rendered by default.

‎action-types.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ inputs:
2424
- Alpine-3.19
2525
- Alpine-3.18
2626
- Alpine-3.17
27-
- Alpine
2827
- Debian-13
2928
- Debian-12
3029
- Debian-11

‎action.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ inputs:
3535
- 'Alpine-3.19'
3636
- 'Alpine-3.18'
3737
- 'Alpine-3.17'
38-
- 'Alpine' (deprecated, 'Alpine-3.17' is a drop-in replacement, except for the wsl-shell-distribution-wrapper name)
3938
- 'Debian-13'
4039
- 'Debian-12'
4140
- 'Debian-11'

‎readme/README_template.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,6 @@ The values currently supported by this action are:
152152
* `Alpine-3.19`
153153
* `Alpine-3.18`
154154
* `Alpine-3.17`
155-
* `Alpine` _(deprecated, 'Alpine-3.17' is a drop-in replacement, except for the wsl-shell-distribution-wrapper name)_
156155
* `Debian-13` **(default)**
157156
* `Debian-12`
158157
* `Debian-11`

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import org.w3c.dom.url.URL
2626
import semver.SemVer
2727

2828
val distributions = listOf(
29-
Alpine,
3029
Alpine317,
3130
Alpine318,
3231
Alpine319,
@@ -503,13 +502,6 @@ abstract class AlpineDistribution : ApkBasedDistribution {
503502
}
504503
}
505504

506-
object Alpine : AlpineDistribution(
507-
wslId = "Alpine",
508-
distributionName = "Alpine",
509-
version = SemVer("3.17.10"),
510-
downloadUrl = URL("https://dl-cdn.alpinelinux.org/alpine/v3.17/releases/x86_64/alpine-minirootfs-3.17.10-x86_64.tar.gz")
511-
)
512-
513505
object Alpine317 : AlpineDistribution(
514506
wslId = "Alpine",
515507
userId = "Alpine-3.17",

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

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -111,21 +111,8 @@ val wslHelp = GlobalScope.async(start = LAZY) {
111111

112112
val distribution by lazy {
113113
val distributionId = getInput("distribution", InputOptions(required = true))
114-
val distribution = distributions[distributionId]
115-
116-
when (distribution) {
117-
Alpine -> warning(
118-
"""
119-
'Alpine' distribution is deprecated.
120-
Please migrate to a versioned distribution such as 'Alpine-3.23'.
121-
'Alpine-3.17' is a drop-in replacement, except for the wsl-shell-distribution-wrapper name.
122-
""".trimIndent()
123-
)
124-
125-
else -> Unit
126-
}
127114

128-
return@lazy requireNotNull(distribution) {
115+
return@lazy requireNotNull(distributions[distributionId]) {
129116
"'${distributionId}' is not a valid distribution. Valid values: ${
130117
distributions.keys.sortedWith(String.CASE_INSENSITIVE_ORDER).joinToString()
131118
}"

0 commit comments

Comments
 (0)