From 186ba094006585b5e057e4f1a8cd510f7b663b22 Mon Sep 17 00:00:00 2001
From: Marek Wolan <marek.wolan@methods.co.uk>
Date: Tue, 11 Jul 2023 08:53:37 +0000
Subject: [PATCH] Changed structure of build pipeline yaml

---
 .azure/azure-ci-build-pipeline.yaml | 92 +++++++++++++++--------------
 1 file changed, 47 insertions(+), 45 deletions(-)

diff --git a/.azure/azure-ci-build-pipeline.yaml b/.azure/azure-ci-build-pipeline.yaml
index de760316..d8568d46 100644
--- a/.azure/azure-ci-build-pipeline.yaml
+++ b/.azure/azure-ci-build-pipeline.yaml
@@ -14,75 +14,77 @@ parameters:
     - job_name: 'UbuntuPython38'
       py: '3.8'
       img: 'ubuntu-latest'
-      only_pr: false
+      every_time: false
     - job_name: 'UbuntuPython310'
       py: '3.10'
       img: 'ubuntu-latest'
-      only_pr: true
+      every_time: true
     - job_name: 'WindowsPython38'
       py: '3.8'
       img: 'windows-latest'
-      only_pr: false
+      every_time: false
     - job_name: 'WindowsPython310'
       py: '3.10'
       img: 'windows-latest'
-      only_pr: false
+      every_time: false
     - job_name: 'MacOSPython38'
       py: '3.8'
       img: 'macOS-latest'
-      only_pr: false
+      every_time: false
     - job_name: 'MacOSPython310'
       py: '3.10'
       img: 'macOS-latest'
-      only_pr: false
+      every_time: false
 
 stages:
   - stage: Test
     jobs:
     - ${{ each item in parameters.matrix }}:
-        ${{ if or(eq(variables['Build.Reason'], 'PullRequest'), item.only_pr) }}:
-          - job: ${{ item.job_name }}
-            pool:
-              vmImage: ${{ item.img }}
-            steps:
-              - task: UsePythonVersion@0
-                inputs:
-                  versionSpec: ${{ item.py }}
-                displayName: 'Use Python ${{ item.py }}'
+      - job: ${{ item.job_name }}
+        pool:
+          vmImage: ${{ item.img }}
+        
+        condition: or( eq(variables['BuildReason'], 'PullRequest'), item.every_time )
 
-              - script: |
-                  python -m pip install pre-commit
-                  pre-commit install
-                  pre-commit run --all-files
-                displayName: 'Run pre-commits'
+        steps:
+          - task: UsePythonVersion@0
+            inputs:
+              versionSpec: ${{ item.py }}
+            displayName: 'Use Python ${{ item.py }}'
 
-              - script: |
-                  python -m pip install --upgrade pip==23.0.1
-                  pip install wheel==0.38.4 --upgrade
-                  pip install setuptools==66 --upgrade
-                  pip install build==0.10.0
-                  pip install pytest-azurepipelines
-                displayName: 'Install build dependencies'
+          - script: |
+              python -m pip install pre-commit
+              pre-commit install
+              pre-commit run --all-files
+            displayName: 'Run pre-commits'
 
-              - script: |
-                  python -m build
-                displayName: 'Build PrimAITE'
+          - script: |
+              python -m pip install --upgrade pip==23.0.1
+              pip install wheel==0.38.4 --upgrade
+              pip install setuptools==66 --upgrade
+              pip install build==0.10.0
+              pip install pytest-azurepipelines
+            displayName: 'Install build dependencies'
 
-              - script: |
-                  PRIMAITE_WHEEL=$(ls ./dist/primaite*.whl)
-                  python -m pip install $PRIMAITE_WHEEL[dev]
-                displayName: 'Install PrimAITE'
-                condition: or(eq( variables['Agent.OS'], 'Linux' ), eq( variables['Agent.OS'], 'Darwin' ))
+          - script: |
+              python -m build
+            displayName: 'Build PrimAITE'
 
-              - script: |
-                  forfiles /p dist\ /m *.whl /c "cmd /c python -m pip install @file[dev]"
-                displayName: 'Install PrimAITE'
-                condition: eq( variables['Agent.OS'], 'Windows_NT' )
+          - script: |
+              PRIMAITE_WHEEL=$(ls ./dist/primaite*.whl)
+              python -m pip install $PRIMAITE_WHEEL[dev]
+            displayName: 'Install PrimAITE'
+            condition: or(eq( variables['Agent.OS'], 'Linux' ), eq( variables['Agent.OS'], 'Darwin' ))
 
-              - script: |
-                  primaite setup
-                displayName: 'Perform PrimAITE Setup'
+          - script: |
+              forfiles /p dist\ /m *.whl /c "cmd /c python -m pip install @file[dev]"
+            displayName: 'Install PrimAITE'
+            condition: eq( variables['Agent.OS'], 'Windows_NT' )
 
-              - script: |
-                  pytest tests/
-                displayName: 'Run tests'
+          - script: |
+              primaite setup
+            displayName: 'Perform PrimAITE Setup'
+
+          - script: |
+              pytest tests/
+            displayName: 'Run tests'