From b3811dfaf7610d5db4f869f28670b207d6118658 Mon Sep 17 00:00:00 2001 From: Alexander Andreev Date: Fri, 25 Apr 2025 13:38:02 +0100 Subject: [PATCH 1/7] Change test confs location --- .../pipeline/test-configuration-linux.yml | 0 .../pipeline/test-configuration-win.yml | 0 azure-pipelines.yml | 4 ++-- 3 files changed, 2 insertions(+), 2 deletions(-) rename test-configuration-linux.yml => .ci/pipeline/test-configuration-linux.yml (100%) rename test-configuration-win.yml => .ci/pipeline/test-configuration-win.yml (100%) diff --git a/test-configuration-linux.yml b/.ci/pipeline/test-configuration-linux.yml similarity index 100% rename from test-configuration-linux.yml rename to .ci/pipeline/test-configuration-linux.yml diff --git a/test-configuration-win.yml b/.ci/pipeline/test-configuration-win.yml similarity index 100% rename from test-configuration-win.yml rename to .ci/pipeline/test-configuration-win.yml diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 80f0cfd9..e58c1a63 100755 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -49,7 +49,7 @@ jobs: pool: vmImage: "ubuntu-latest" steps: - - template: test-configuration-linux.yml + - template: .ci/pipeline/test-configuration-linux.yml - job: Windows dependsOn: Lint strategy: @@ -75,4 +75,4 @@ jobs: pool: vmImage: "windows-latest" steps: - - template: test-configuration-win.yml + - template: .ci/pipeline/test-configuration-linux.yml From 0982dfcc9291c64b469828dd9191376d8ef9ac3b Mon Sep 17 00:00:00 2001 From: Alexander Andreev Date: Fri, 25 Apr 2025 13:44:18 +0100 Subject: [PATCH 2/7] Fix template name --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index e58c1a63..5d840fcc 100755 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -75,4 +75,4 @@ jobs: pool: vmImage: "windows-latest" steps: - - template: .ci/pipeline/test-configuration-linux.yml + - template: .ci/pipeline/test-configuration-win.yml From 73671c0c55fb23569674da294d6947d0d475254c Mon Sep 17 00:00:00 2001 From: Alexander Andreev Date: Fri, 25 Apr 2025 13:45:09 +0100 Subject: [PATCH 3/7] Change matrix specification way --- .ci/pipeline/test-matrix.yml | 35 +++++++++++++++++++++++++++++++ azure-pipelines.yml | 40 ++---------------------------------- 2 files changed, 37 insertions(+), 38 deletions(-) create mode 100644 .ci/pipeline/test-matrix.yml diff --git a/.ci/pipeline/test-matrix.yml b/.ci/pipeline/test-matrix.yml new file mode 100644 index 00000000..add9935b --- /dev/null +++ b/.ci/pipeline/test-matrix.yml @@ -0,0 +1,35 @@ +#=============================================================================== +# Copyright 2025 Intel Corporation +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +#=============================================================================== + +matrix: + Python3.9_Pip: + PYTHON_VERSION: "3.9" + PKG_MANAGER: "pip" + Python3.10_Pip: + PYTHON_VERSION: "3.10" + PKG_MANAGER: "pip" + Python3.11_Pip: + PYTHON_VERSION: "3.11" + PKG_MANAGER: "pip" + Python3.9_Conda: + PYTHON_VERSION: "3.9" + PKG_MANAGER: "conda" + Python3.10_Conda: + PYTHON_VERSION: "3.10" + PKG_MANAGER: "conda" + Python3.11_Conda: + PYTHON_VERSION: "3.11" + PKG_MANAGER: "conda" diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 5d840fcc..dda41d4d 100755 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -27,25 +27,7 @@ jobs: - job: Linux dependsOn: Lint strategy: - matrix: - Python3.9_Pip: - PYTHON_VERSION: "3.9" - PKG_MANAGER: "pip" - Python3.10_Pip: - PYTHON_VERSION: "3.10" - PKG_MANAGER: "pip" - Python3.11_Pip: - PYTHON_VERSION: "3.11" - PKG_MANAGER: "pip" - Python3.9_Conda: - PYTHON_VERSION: "3.9" - PKG_MANAGER: "conda" - Python3.10_Conda: - PYTHON_VERSION: "3.10" - PKG_MANAGER: "conda" - Python3.11_Conda: - PYTHON_VERSION: "3.11" - PKG_MANAGER: "conda" + ${{ template: .ci/pipeline/matrix-template.yml }} pool: vmImage: "ubuntu-latest" steps: @@ -53,25 +35,7 @@ jobs: - job: Windows dependsOn: Lint strategy: - matrix: - Python3.9_Pip: - PYTHON_VERSION: "3.9" - PKG_MANAGER: "pip" - Python3.10_Pip: - PYTHON_VERSION: "3.10" - PKG_MANAGER: "pip" - Python3.11_Pip: - PYTHON_VERSION: "3.11" - PKG_MANAGER: "pip" - Python3.9_Conda: - PYTHON_VERSION: "3.9" - PKG_MANAGER: "conda" - Python3.10_Conda: - PYTHON_VERSION: "3.10" - PKG_MANAGER: "conda" - Python3.11_Conda: - PYTHON_VERSION: "3.11" - PKG_MANAGER: "conda" + ${{ template: .ci/pipeline/matrix-template.yml }} pool: vmImage: "windows-latest" steps: From 5bc34597797f4c9f304c82d83b22f2e918da5508 Mon Sep 17 00:00:00 2001 From: Alexander Andreev Date: Fri, 25 Apr 2025 13:45:53 +0100 Subject: [PATCH 4/7] Revert "Change matrix specification way" This reverts commit 73671c0c55fb23569674da294d6947d0d475254c. --- .ci/pipeline/test-matrix.yml | 35 ------------------------------- azure-pipelines.yml | 40 ++++++++++++++++++++++++++++++++++-- 2 files changed, 38 insertions(+), 37 deletions(-) delete mode 100644 .ci/pipeline/test-matrix.yml diff --git a/.ci/pipeline/test-matrix.yml b/.ci/pipeline/test-matrix.yml deleted file mode 100644 index add9935b..00000000 --- a/.ci/pipeline/test-matrix.yml +++ /dev/null @@ -1,35 +0,0 @@ -#=============================================================================== -# Copyright 2025 Intel Corporation -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -#=============================================================================== - -matrix: - Python3.9_Pip: - PYTHON_VERSION: "3.9" - PKG_MANAGER: "pip" - Python3.10_Pip: - PYTHON_VERSION: "3.10" - PKG_MANAGER: "pip" - Python3.11_Pip: - PYTHON_VERSION: "3.11" - PKG_MANAGER: "pip" - Python3.9_Conda: - PYTHON_VERSION: "3.9" - PKG_MANAGER: "conda" - Python3.10_Conda: - PYTHON_VERSION: "3.10" - PKG_MANAGER: "conda" - Python3.11_Conda: - PYTHON_VERSION: "3.11" - PKG_MANAGER: "conda" diff --git a/azure-pipelines.yml b/azure-pipelines.yml index dda41d4d..5d840fcc 100755 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -27,7 +27,25 @@ jobs: - job: Linux dependsOn: Lint strategy: - ${{ template: .ci/pipeline/matrix-template.yml }} + matrix: + Python3.9_Pip: + PYTHON_VERSION: "3.9" + PKG_MANAGER: "pip" + Python3.10_Pip: + PYTHON_VERSION: "3.10" + PKG_MANAGER: "pip" + Python3.11_Pip: + PYTHON_VERSION: "3.11" + PKG_MANAGER: "pip" + Python3.9_Conda: + PYTHON_VERSION: "3.9" + PKG_MANAGER: "conda" + Python3.10_Conda: + PYTHON_VERSION: "3.10" + PKG_MANAGER: "conda" + Python3.11_Conda: + PYTHON_VERSION: "3.11" + PKG_MANAGER: "conda" pool: vmImage: "ubuntu-latest" steps: @@ -35,7 +53,25 @@ jobs: - job: Windows dependsOn: Lint strategy: - ${{ template: .ci/pipeline/matrix-template.yml }} + matrix: + Python3.9_Pip: + PYTHON_VERSION: "3.9" + PKG_MANAGER: "pip" + Python3.10_Pip: + PYTHON_VERSION: "3.10" + PKG_MANAGER: "pip" + Python3.11_Pip: + PYTHON_VERSION: "3.11" + PKG_MANAGER: "pip" + Python3.9_Conda: + PYTHON_VERSION: "3.9" + PKG_MANAGER: "conda" + Python3.10_Conda: + PYTHON_VERSION: "3.10" + PKG_MANAGER: "conda" + Python3.11_Conda: + PYTHON_VERSION: "3.11" + PKG_MANAGER: "conda" pool: vmImage: "windows-latest" steps: From 241d71d94c7dc480567b5f26b76ddcb5440b4ec9 Mon Sep 17 00:00:00 2001 From: Alexander Andreev Date: Fri, 25 Apr 2025 13:48:33 +0100 Subject: [PATCH 5/7] Change matrix specification way - trial 2 --- .ci/pipeline/test-matrix.yml | 35 +++++++++++++++++++++++++++++++++ azure-pipelines.yml | 38 ++---------------------------------- 2 files changed, 37 insertions(+), 36 deletions(-) create mode 100644 .ci/pipeline/test-matrix.yml diff --git a/.ci/pipeline/test-matrix.yml b/.ci/pipeline/test-matrix.yml new file mode 100644 index 00000000..add9935b --- /dev/null +++ b/.ci/pipeline/test-matrix.yml @@ -0,0 +1,35 @@ +#=============================================================================== +# Copyright 2025 Intel Corporation +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +#=============================================================================== + +matrix: + Python3.9_Pip: + PYTHON_VERSION: "3.9" + PKG_MANAGER: "pip" + Python3.10_Pip: + PYTHON_VERSION: "3.10" + PKG_MANAGER: "pip" + Python3.11_Pip: + PYTHON_VERSION: "3.11" + PKG_MANAGER: "pip" + Python3.9_Conda: + PYTHON_VERSION: "3.9" + PKG_MANAGER: "conda" + Python3.10_Conda: + PYTHON_VERSION: "3.10" + PKG_MANAGER: "conda" + Python3.11_Conda: + PYTHON_VERSION: "3.11" + PKG_MANAGER: "conda" diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 5d840fcc..138fc44d 100755 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -28,24 +28,7 @@ jobs: dependsOn: Lint strategy: matrix: - Python3.9_Pip: - PYTHON_VERSION: "3.9" - PKG_MANAGER: "pip" - Python3.10_Pip: - PYTHON_VERSION: "3.10" - PKG_MANAGER: "pip" - Python3.11_Pip: - PYTHON_VERSION: "3.11" - PKG_MANAGER: "pip" - Python3.9_Conda: - PYTHON_VERSION: "3.9" - PKG_MANAGER: "conda" - Python3.10_Conda: - PYTHON_VERSION: "3.10" - PKG_MANAGER: "conda" - Python3.11_Conda: - PYTHON_VERSION: "3.11" - PKG_MANAGER: "conda" + ${{ template: .ci/pipeline/test-matrix.yml }} pool: vmImage: "ubuntu-latest" steps: @@ -54,24 +37,7 @@ jobs: dependsOn: Lint strategy: matrix: - Python3.9_Pip: - PYTHON_VERSION: "3.9" - PKG_MANAGER: "pip" - Python3.10_Pip: - PYTHON_VERSION: "3.10" - PKG_MANAGER: "pip" - Python3.11_Pip: - PYTHON_VERSION: "3.11" - PKG_MANAGER: "pip" - Python3.9_Conda: - PYTHON_VERSION: "3.9" - PKG_MANAGER: "conda" - Python3.10_Conda: - PYTHON_VERSION: "3.10" - PKG_MANAGER: "conda" - Python3.11_Conda: - PYTHON_VERSION: "3.11" - PKG_MANAGER: "conda" + ${{ template: .ci/pipeline/test-matrix.yml }} pool: vmImage: "windows-latest" steps: From ea6b3fd98ce850e139eb2d308667680385b4368d Mon Sep 17 00:00:00 2001 From: Alexander Andreev Date: Fri, 25 Apr 2025 13:49:24 +0100 Subject: [PATCH 6/7] Revert "Change matrix specification way - trial 2" This reverts commit 241d71d94c7dc480567b5f26b76ddcb5440b4ec9. --- .ci/pipeline/test-matrix.yml | 35 --------------------------------- azure-pipelines.yml | 38 ++++++++++++++++++++++++++++++++++-- 2 files changed, 36 insertions(+), 37 deletions(-) delete mode 100644 .ci/pipeline/test-matrix.yml diff --git a/.ci/pipeline/test-matrix.yml b/.ci/pipeline/test-matrix.yml deleted file mode 100644 index add9935b..00000000 --- a/.ci/pipeline/test-matrix.yml +++ /dev/null @@ -1,35 +0,0 @@ -#=============================================================================== -# Copyright 2025 Intel Corporation -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -#=============================================================================== - -matrix: - Python3.9_Pip: - PYTHON_VERSION: "3.9" - PKG_MANAGER: "pip" - Python3.10_Pip: - PYTHON_VERSION: "3.10" - PKG_MANAGER: "pip" - Python3.11_Pip: - PYTHON_VERSION: "3.11" - PKG_MANAGER: "pip" - Python3.9_Conda: - PYTHON_VERSION: "3.9" - PKG_MANAGER: "conda" - Python3.10_Conda: - PYTHON_VERSION: "3.10" - PKG_MANAGER: "conda" - Python3.11_Conda: - PYTHON_VERSION: "3.11" - PKG_MANAGER: "conda" diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 138fc44d..5d840fcc 100755 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -28,7 +28,24 @@ jobs: dependsOn: Lint strategy: matrix: - ${{ template: .ci/pipeline/test-matrix.yml }} + Python3.9_Pip: + PYTHON_VERSION: "3.9" + PKG_MANAGER: "pip" + Python3.10_Pip: + PYTHON_VERSION: "3.10" + PKG_MANAGER: "pip" + Python3.11_Pip: + PYTHON_VERSION: "3.11" + PKG_MANAGER: "pip" + Python3.9_Conda: + PYTHON_VERSION: "3.9" + PKG_MANAGER: "conda" + Python3.10_Conda: + PYTHON_VERSION: "3.10" + PKG_MANAGER: "conda" + Python3.11_Conda: + PYTHON_VERSION: "3.11" + PKG_MANAGER: "conda" pool: vmImage: "ubuntu-latest" steps: @@ -37,7 +54,24 @@ jobs: dependsOn: Lint strategy: matrix: - ${{ template: .ci/pipeline/test-matrix.yml }} + Python3.9_Pip: + PYTHON_VERSION: "3.9" + PKG_MANAGER: "pip" + Python3.10_Pip: + PYTHON_VERSION: "3.10" + PKG_MANAGER: "pip" + Python3.11_Pip: + PYTHON_VERSION: "3.11" + PKG_MANAGER: "pip" + Python3.9_Conda: + PYTHON_VERSION: "3.9" + PKG_MANAGER: "conda" + Python3.10_Conda: + PYTHON_VERSION: "3.10" + PKG_MANAGER: "conda" + Python3.11_Conda: + PYTHON_VERSION: "3.11" + PKG_MANAGER: "conda" pool: vmImage: "windows-latest" steps: From ae8e5d5fd4d6aecbca4ae1e1e4df9be619e268fb Mon Sep 17 00:00:00 2001 From: Alexander Andreev Date: Fri, 25 Apr 2025 13:50:32 +0100 Subject: [PATCH 7/7] Move CI conf --- azure-pipelines.yml => .ci/pipeline/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename azure-pipelines.yml => .ci/pipeline/ci.yml (92%) diff --git a/azure-pipelines.yml b/.ci/pipeline/ci.yml similarity index 92% rename from azure-pipelines.yml rename to .ci/pipeline/ci.yml index 5d840fcc..80f0cfd9 100755 --- a/azure-pipelines.yml +++ b/.ci/pipeline/ci.yml @@ -49,7 +49,7 @@ jobs: pool: vmImage: "ubuntu-latest" steps: - - template: .ci/pipeline/test-configuration-linux.yml + - template: test-configuration-linux.yml - job: Windows dependsOn: Lint strategy: @@ -75,4 +75,4 @@ jobs: pool: vmImage: "windows-latest" steps: - - template: .ci/pipeline/test-configuration-win.yml + - template: test-configuration-win.yml