Enforce identical versions in artiq and artiq-win64-test builders.

whitequark · whitequark · commit 786314edb85b · 2018-02-21T09:22:24.000Z
diff --git a/master.cfg b/master.cfg
@@ -547,7 +547,8 @@ addTriggerSteps(artiqBuildFactory,
     builder_names=['artiq-win64-test'],
     alwaysUseLatest=False,
     waitForFinish=True,
-    set_properties={'package': WithProperties('%(output_name)s')})
+    set_properties={'package': WithProperties('%(output_name)s'),
+                    'conda_version': WithProperties('%(output_version)s=%(output_build)s')})
 addFlockReleaseSteps(artiqBuildFactory,
     board=test_board)
 # Build and upload ARTIQ documentation
@@ -628,7 +629,7 @@ artiqWin64TestBuildFactory = BuildFactory()
 addUpdateSteps(artiqWin64TestBuildFactory,
     project='artiq')
 addCondaSetupTestEnvironmentSteps(artiqWin64TestBuildFactory,
-    packages=['%(package)s'])
+    packages=['%(package)s=%(conda_version)s'])
 addPythonUnittestSteps(artiqWin64TestBuildFactory,
     locks=[low_latency_lock.access('exclusive')],
     extra_vars={ 'ARTIQ_LOW_LATENCY': '1', 'ARTIQ_ROOT': 'artiq\\examples\\master' },
