Move macOS tests to the front of the CI, TO BE REVERTED

horovod · Dec 13, 2021 · 6b4beca · 6b4beca
1 parent 50c6cf3
commit 6b4beca
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/gen-workflow-ci.py b/.github/gen-workflow-ci.py
@@ -800,9 +800,9 @@ def sync_files(needs: List[str]) -> str:
         workflow = workflow_header() + jobs(
             init_workflow_job(),
             # changing these names require changes in the workflow-conclusion step in ci-fork.yaml
-            build_and_test_images(id='build-and-test', name='Build and Test', needs=['init-workflow'], images=release_images, parallel_images='-cpu-', tests_per_image=tests_per_image, tests=tests),
+            build_and_test_images(id='build-and-test', name='Build and Test', needs=['build-and-test-macos'], images=release_images, parallel_images='-cpu-', tests_per_image=tests_per_image, tests=tests),
             build_and_test_images(id='build-and-test-heads', name='Build and Test heads', needs=['build-and-test'], images=allhead_images, parallel_images='', tests_per_image=tests_per_image, tests=tests),
-            build_and_test_macos(id='build-and-test-macos', name='Build and Test macOS', needs=['build-and-test']),
+            build_and_test_macos(id='build-and-test-macos', name='Build and Test macOS', needs=['init-workflow']),
             trigger_buildkite_job(id='buildkite', name='Build and Test GPU (on Builtkite)', needs=['build-and-test'], mode='GPU NON HEADS'),
             trigger_buildkite_job(id='buildkite-heads', name='Build and Test GPU heads (on Builtkite)', needs=['build-and-test'], mode='GPU HEADS'),
             publish_docker_images(needs=['build-and-test', 'buildkite'], images=['horovod', 'horovod-cpu', 'horovod-ray']),

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -153,7 +153,7 @@ jobs:
 
   build-and-test:
     name: "Build and Test (${{ matrix.image }})"
-    needs: [init-workflow]
+    needs: [init-workflow, build-and-test-macos]
     if: >
       needs.init-workflow.outputs.run-at-all == 'true' &&
       needs.init-workflow.outputs.run-builds-and-tests == 'true'
@@ -3341,7 +3341,7 @@ jobs:
 
   build-and-test-macos:
     name: "Build and Test macOS (${{ matrix.image }}-macos)"
-    needs: [init-workflow, build-and-test]
+    needs: [init-workflow]
     if: >
       needs.init-workflow.outputs.run-at-all == 'true' &&
       needs.init-workflow.outputs.run-builds-and-tests == 'true'