Merge branch 'develop' into weekly_tests

hcannoodt · hcannoodt · commit ce2e1804dd9b · 2025-09-30T22:09:55.000+02:00
diff --git a/src/test/scala/io/viash/auxiliary/MainBuildAuxiliaryDockerRequirements.scala b/src/test/scala/io/viash/auxiliary/MainBuildAuxiliaryDockerRequirements.scala
@@ -477,7 +477,7 @@ class MainBuildAuxiliaryDockerRequirementsR extends AbstractMainBuildAuxiliaryDo
 
     assert(testOutput.exitCode == Some(1))
     assert(testOutput.stdout.contains("Error: Failed to install 'non-existing-package' from CRAN"))
-    assert(testOutput.stdout.contains("ERROR: failed to solve"))
+    assert(testOutput.stdout.contains("ERROR: failed to solve:") || testOutput.stdout.contains("ERROR: failed to build: failed to solve:"))
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -477,7 +477,7 @@ class MainBuildAuxiliaryDockerRequirementsR extends AbstractMainBuildAuxiliaryDo`
`477`	`477`
`478`	`478`	`assert(testOutput.exitCode == Some(1))`
`479`	`479`	`assert(testOutput.stdout.contains("Error: Failed to install 'non-existing-package' from CRAN"))`
`480`		`- assert(testOutput.stdout.contains("ERROR: failed to solve"))`
	`480`	`+ assert(testOutput.stdout.contains("ERROR: failed to solve:") \|\| testOutput.stdout.contains("ERROR: failed to build: failed to solve:"))`
`481`	`481`	`}`
`482`	`482`	`}`
`483`	`483`