From ad9a71b91554e8f2ab2b25e57cfc293e9c5c15a0 Mon Sep 17 00:00:00 2001
From: "Stephan T. Lavavej" <stl@nuwen.net>
Date: Thu, 16 Jun 2022 01:15:44 -0700
Subject: [PATCH] Use `--order=lexical` for deterministic shard behavior.

---
 azure-devops/cross-build.yml       | 2 +-
 azure-devops/native-build-test.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/azure-devops/cross-build.yml b/azure-devops/cross-build.yml
index 0b5644c112c..0f802cacc37 100644
--- a/azure-devops/cross-build.yml
+++ b/azure-devops/cross-build.yml
@@ -21,7 +21,7 @@ jobs:
     fixedFlags: '--timeout=240;--shuffle'
     parallelismFlag: '-j$(testParallelism)'
     xmlOutputFlag: '--xunit-xml-output=$(${{ parameters.buildOutputLocationVar }})/test-results.xml'
-    shardFlags: '--num-shards=$(System.TotalJobsInPhase);--run-shard=$(System.JobPositionInPhase)'
+    shardFlags: '--order=lexical;--num-shards=$(System.TotalJobsInPhase);--run-shard=$(System.JobPositionInPhase)'
     litFlags: '$(fixedFlags);$(parallelismFlag);$(xmlOutputFlag);$(shardFlags)'
   strategy:
     parallel: ${{ parameters.numShards }}
diff --git a/azure-devops/native-build-test.yml b/azure-devops/native-build-test.yml
index 25bdb0e1c7c..02f124b2f4f 100644
--- a/azure-devops/native-build-test.yml
+++ b/azure-devops/native-build-test.yml
@@ -18,7 +18,7 @@ jobs:
     fixedFlags: '--timeout=240;--shuffle'
     parallelismFlag: '-j$(testParallelism)'
     xmlOutputFlag: '--xunit-xml-output=$(${{ parameters.buildOutputLocationVar }})/test-results.xml'
-    shardFlags: '--num-shards=$(System.TotalJobsInPhase);--run-shard=$(System.JobPositionInPhase)'
+    shardFlags: '--order=lexical;--num-shards=$(System.TotalJobsInPhase);--run-shard=$(System.JobPositionInPhase)'
     litFlags: '$(fixedFlags);$(parallelismFlag);$(xmlOutputFlag);$(shardFlags)'
   strategy:
     parallel: ${{ parameters.numShards }}