Skip to content

Commit 9136c9b

Browse files
authored
Tag tests relying on old snapshots as (or remove them where applicable) (#3817)
1 parent 4dc618a commit 9136c9b

File tree

4 files changed

+11
-13
lines changed

4 files changed

+11
-13
lines changed

modules/integration/src/test/scala/scala/cli/integration/BloopTests.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ class BloopTests extends ScalaCliSuite {
244244

245245
{
246246
val bloopSnapshotVersion = "2.0.6-51-38c118d4-SNAPSHOT"
247-
test(s"compilation works with a Bloop snapshot version: $bloopSnapshotVersion") {
247+
test(s"compilation works with a Bloop snapshot version: $bloopSnapshotVersion".flaky) {
248248
val input = "script.sc"
249249
TestInputs(os.rel / input -> """println("Hello")""").fromRoot { root =>
250250
os.proc(TestUtil.cli, "compile", input, "--bloop-version", bloopSnapshotVersion)

modules/integration/src/test/scala/scala/cli/integration/BspTestDefinitions.scala

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2169,7 +2169,9 @@ abstract class BspTestDefinitions extends ScalaCliSuite with TestScalaVersionArg
21692169
}
21702170
}
21712171

2172-
for { cliVersion <- Seq("1.5.0", "1.5.0-19-g932866db6-SNAPSHOT", "1.0.0") }
2172+
for {
2173+
cliVersion <- Seq("1.8.4", "1.5.0", "1.0.0")
2174+
} // TODO: test for nightly, too
21732175
test(s"setup-ide doesn't pass unrecognised arguments to old --cli-versions: $cliVersion") {
21742176
TestUtil.retryOnCi() {
21752177
val scriptName = "cli-version.sc"
@@ -2193,7 +2195,9 @@ abstract class BspTestDefinitions extends ScalaCliSuite with TestScalaVersionArg
21932195
}
21942196
}
21952197

2196-
for { cliVersion <- Seq("1.5.0-34-g31a88e428-SNAPSHOT", "1.6.0") }
2198+
for {
2199+
cliVersion <- Seq("1.8.4")
2200+
} // TODO: test for nightly, too
21972201
test(
21982202
s"setup-ide prepares a valid BSP configuration with --cli-version $cliVersion"
21992203
) {
@@ -2202,9 +2206,8 @@ abstract class BspTestDefinitions extends ScalaCliSuite with TestScalaVersionArg
22022206
TestInputs(os.rel / scriptName -> s"""println("Hello from launcher v$cliVersion")""")
22032207
.fromRoot { root =>
22042208
val cliVersionArgs = List("--cli-version", cliVersion)
2205-
os.proc(TestUtil.cli, cliVersionArgs, "setup-ide", scriptName, extraOptions).call(cwd =
2206-
root
2207-
)
2209+
os.proc(TestUtil.cli, cliVersionArgs, "setup-ide", scriptName, extraOptions)
2210+
.call(cwd = root)
22082211
val expectedIdeLauncherFile =
22092212
root / Constants.workspaceDirName / "ide-launcher-options.json"
22102213
expect(expectedIdeLauncherFile.toNIO.toFile.exists())

website/docs/commands/basics.md

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ To run another Scala CLI version, specify it with `--cli-version` before any oth
317317

318318
<ChainedSnippets>
319319

320-
```bash
320+
```bash ignore
321321
scala-cli --cli-version 0.1.17-62-g21e1cf44-SNAPSHOT version
322322
```
323323

@@ -328,11 +328,6 @@ Scala version (default): 3.2.1
328328

329329
</ChainedSnippets>
330330

331-
<!-- Expected:
332-
Scala CLI version: 0.1.17-62-g21e1cf44-SNAPSHOT
333-
Scala version (default): 3.2.1
334-
-->
335-
336331
To use the latest Scala CLI nightly build, pass `nightly` to `--cli-version` parameter:
337332

338333
<ChainedSnippets>

website/docs/guides/advanced/custom-toolkit.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ Similarly, it is also possible to publish to a central repository. Refer to the
4848

4949
Once it is published, it can be accessed using the org-name with which it got published. For example, with the published toolkit under the organization `com.yadavan88`, it can be accessed as:
5050

51-
```scala compile
51+
```scala
5252
//> using toolkit com.yadavan88:0.1.1-SNAPSHOT
5353

5454
@main

0 commit comments

Comments
 (0)