From 8ff90731610d63fbf53251f9730ad25e9d25799c Mon Sep 17 00:00:00 2001
From: Adriane Boyd <adrianeboyd@gmail.com>
Date: Mon, 13 Mar 2023 14:21:17 +0100
Subject: [PATCH] CI: Move universe validation to validate job (#12406)

* CI: Move universe validation to validate job

* Fix indentation

* Update step name
---
 .github/azure-steps.yml     | 6 ------
 .github/workflows/tests.yml | 8 +++-----
 azure-pipelines.yml         | 3 +++
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/.github/azure-steps.yml b/.github/azure-steps.yml
index b2ccf3d81..1b8d81521 100644
--- a/.github/azure-steps.yml
+++ b/.github/azure-steps.yml
@@ -116,9 +116,3 @@ steps:
       python -m pytest --pyargs spacy
     displayName: "Run CPU tests with thinc-apple-ops"
     condition: and(startsWith(variables['imageName'], 'macos'), eq(variables['python.version'], '3.11'))
-
-  - script: |
-      python .github/validate_universe_json.py website/meta/universe.json
-    displayName: 'Test website/meta/universe.json'
-    condition: eq(variables['python_version'], '3.8')
-
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index ad380d39a..b04e2a8c0 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -58,6 +58,9 @@ jobs:
         run: |
           python -m pip install flake8==5.0.4
           python -m flake8 spacy --count --select=E901,E999,F821,F822,F823,W605 --show-source --statistics
+      - name: Validate website/meta/universe.json
+        run: |
+          python .github/validate_universe_json.py website/meta/universe.json
   tests:
     name: Test
     needs: Validate
@@ -188,8 +191,3 @@ jobs:
           python -m pip install 'spacy[apple]'
           python -m pytest --pyargs spacy
         if: startsWith(matrix.os, 'macos') && matrix.python_version == '3.8'
-
-      - run: |
-          python .github/validate_universe_json.py website/meta/universe.json
-        name: "Test website/meta/universe.json"
-        if: matrix.python_version == '3.8'
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index dba11bd1a..83c57a164 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -48,6 +48,9 @@ jobs:
           pip install flake8==5.0.4
           python -m flake8 spacy --count --select=E901,E999,F821,F822,F823,W605 --show-source --statistics
         displayName: "flake8"
+      - script: |
+          python .github/validate_universe_json.py website/meta/universe.json
+        displayName: 'Validate website/meta/universe.json'
 
   - job: "Test"
     dependsOn: "Validate"