Merge branch 'main' into add-verify-clean-pkl

HT154 · web-flow · commit a12fb067a476 · 2025-11-13T17:01:28.000-08:00
diff --git a/packages/pkl.impl.ghactions/PklCI.pkl b/packages/pkl.impl.ghactions/PklCI.pkl
@@ -422,7 +422,11 @@ local withPublishTestResultsForMultipleJobs: Mixin<Workflow.Jobs> = (it) -> (it)
         name = "Publish test results"
         `if` = "!cancelled()"
         with {
-          file_patterns = testReports.junit
+          file_patterns {
+            for (pattern in testReports.junit) {
+              "test-results-xml-*/\(pattern)"
+            }
+          }
           comment_mode = "off"
         }
       }
diff --git a/packages/pkl.impl.ghactions/steps/SetupPkl.pkl b/packages/pkl.impl.ghactions/steps/SetupPkl.pkl
@@ -41,8 +41,6 @@ fixed step: Workflow.Step = new {
   // language=bash
   run =
     """
-    set -ex
-
     DIR="$(mktemp -d /tmp/pkl-$PKL_VERSION-XXXXXX)"
     PKL_EXEC="$DIR/$PKL_FILENAME"
     curl -sfL -o $PKL_EXEC "$PKL_DOWNLOAD_URL"

Original file line number	Diff line number	Diff line change
`@@ -422,7 +422,11 @@ local withPublishTestResultsForMultipleJobs: Mixin<Workflow.Jobs> = (it) -> (it)`
`422`	`422`	`name = "Publish test results"`
`423`	`423`	`if` = "!cancelled()"
`424`	`424`	`with {`
`425`		`- file_patterns = testReports.junit`
	`425`	`+ file_patterns {`
	`426`	`+ for (pattern in testReports.junit) {`
	`427`	`+ "test-results-xml-*/\(pattern)"`
	`428`	`+ }`
	`429`	`+ }`
`426`	`430`	`comment_mode = "off"`
`427`	`431`	`}`
`428`	`432`	`}`