From 0a5d25fe019d322ee24e7d4450f4f89d04a037c7 Mon Sep 17 00:00:00 2001 From: Marek Wolan Date: Mon, 3 Jul 2023 12:37:08 +0000 Subject: [PATCH 1/5] Add windows build option --- .azure/azure-ci-build-pipeline.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.azure/azure-ci-build-pipeline.yaml b/.azure/azure-ci-build-pipeline.yaml index a93aa131..91c113a7 100644 --- a/.azure/azure-ci-build-pipeline.yaml +++ b/.azure/azure-ci-build-pipeline.yaml @@ -55,8 +55,11 @@ steps: displayName: 'Build PrimAITE' - script: | +- ${{ if eq( variables['Agent.OS'], 'Linux') }}: PRIMAITE_WHEEL=$(ls ./dist/primaite*.whl) python -m pip install $PRIMAITE_WHEEL[dev] +- ${{ elseif eq( variable['Agent.OS'], 'Windows_NT') }}: + forfiles /p dist\ /m *.whl /c "cmd /c python -m pip install @file" displayName: 'Install PrimAITE' - script: | From 4b56e7bd3ac32585d1fc1211e89e2d65598960d0 Mon Sep 17 00:00:00 2001 From: Marek Wolan Date: Mon, 3 Jul 2023 12:40:02 +0000 Subject: [PATCH 2/5] Updated azure-ci-build-pipeline.yaml --- .azure/azure-ci-build-pipeline.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azure/azure-ci-build-pipeline.yaml b/.azure/azure-ci-build-pipeline.yaml index 91c113a7..5ce13919 100644 --- a/.azure/azure-ci-build-pipeline.yaml +++ b/.azure/azure-ci-build-pipeline.yaml @@ -58,7 +58,7 @@ steps: - ${{ if eq( variables['Agent.OS'], 'Linux') }}: PRIMAITE_WHEEL=$(ls ./dist/primaite*.whl) python -m pip install $PRIMAITE_WHEEL[dev] -- ${{ elseif eq( variable['Agent.OS'], 'Windows_NT') }}: +- ${{ elseif eq( variables['Agent.OS'], 'Windows_NT') }}: forfiles /p dist\ /m *.whl /c "cmd /c python -m pip install @file" displayName: 'Install PrimAITE' From fa231057a8f96f3d5f8cdb4c332c18a0203ba6e4 Mon Sep 17 00:00:00 2001 From: Marek Wolan Date: Mon, 3 Jul 2023 12:44:01 +0000 Subject: [PATCH 3/5] Updated azure-ci-build-pipeline.yaml --- .azure/azure-ci-build-pipeline.yaml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.azure/azure-ci-build-pipeline.yaml b/.azure/azure-ci-build-pipeline.yaml index 5ce13919..06e44f48 100644 --- a/.azure/azure-ci-build-pipeline.yaml +++ b/.azure/azure-ci-build-pipeline.yaml @@ -55,12 +55,15 @@ steps: displayName: 'Build PrimAITE' - script: | -- ${{ if eq( variables['Agent.OS'], 'Linux') }}: PRIMAITE_WHEEL=$(ls ./dist/primaite*.whl) python -m pip install $PRIMAITE_WHEEL[dev] -- ${{ elseif eq( variables['Agent.OS'], 'Windows_NT') }}: + displayName: 'Install PrimAITE' + condition: eq( variables['Agent.OS'], 'Linux' ) + +- script: | forfiles /p dist\ /m *.whl /c "cmd /c python -m pip install @file" displayName: 'Install PrimAITE' + condition: eq( variables['Agent.OS'], 'Windows_NT' ) - script: | primaite setup From 9964ac4cea372d5796fec8d54ce40142e0f42710 Mon Sep 17 00:00:00 2001 From: Marek Wolan Date: Mon, 3 Jul 2023 13:36:33 +0000 Subject: [PATCH 4/5] Updated azure-ci-build-pipeline.yaml --- .azure/azure-ci-build-pipeline.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azure/azure-ci-build-pipeline.yaml b/.azure/azure-ci-build-pipeline.yaml index 06e44f48..244887a1 100644 --- a/.azure/azure-ci-build-pipeline.yaml +++ b/.azure/azure-ci-build-pipeline.yaml @@ -58,7 +58,7 @@ steps: PRIMAITE_WHEEL=$(ls ./dist/primaite*.whl) python -m pip install $PRIMAITE_WHEEL[dev] displayName: 'Install PrimAITE' - condition: eq( variables['Agent.OS'], 'Linux' ) + condition: or(eq( variables['Agent.OS'], 'Linux' ), eq( variables['Agent.OS'], 'Darwin' )) - script: | forfiles /p dist\ /m *.whl /c "cmd /c python -m pip install @file" From 0fcc5c017913549fe62c098ba1a858c466499df3 Mon Sep 17 00:00:00 2001 From: Marek Wolan Date: Mon, 3 Jul 2023 16:02:59 +0000 Subject: [PATCH 5/5] Updated azure-ci-build-pipeline.yaml --- .azure/azure-ci-build-pipeline.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azure/azure-ci-build-pipeline.yaml b/.azure/azure-ci-build-pipeline.yaml index 244887a1..902eb38d 100644 --- a/.azure/azure-ci-build-pipeline.yaml +++ b/.azure/azure-ci-build-pipeline.yaml @@ -61,7 +61,7 @@ steps: condition: or(eq( variables['Agent.OS'], 'Linux' ), eq( variables['Agent.OS'], 'Darwin' )) - script: | - forfiles /p dist\ /m *.whl /c "cmd /c python -m pip install @file" + forfiles /p dist\ /m *.whl /c "cmd /c python -m pip install @file[dev]" displayName: 'Install PrimAITE' condition: eq( variables['Agent.OS'], 'Windows_NT' )