Skip to content

Commit 04fb452

Browse files
authored
[CI] Centralize clang-format install to dependencies-dev (#2543)
* Update dependencies-dev * Update build-and-test-lnx.yml * Update build-and-test-win.yml * Update ci.yml * Update dependencies-dev
1 parent 2159f3e commit 04fb452

4 files changed

Lines changed: 5 additions & 4 deletions

File tree

.ci/pipeline/build-and-test-lnx.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# limitations under the License.
1515
#===============================================================================
1616
steps:
17-
- script: sudo apt-get update && sudo apt-get install -y clang-format
17+
- script: sudo apt-get update
1818
displayName: "apt-get"
1919
- script: |
2020
bash .ci/scripts/install_dpcpp.sh

.ci/pipeline/build-and-test-win.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
steps:
1717
- powershell: Write-Host "##vso[task.prependpath]$env:CONDA\Scripts"
1818
displayName: Add conda to PATH
19-
- script: conda create -q -y -n CB -c conda-forge python=$(PYTHON_VERSION) impi-devel clang-format pyyaml
19+
- script: conda create -q -y -n CB -c conda-forge python=$(PYTHON_VERSION) impi-devel pyyaml
2020
displayName: 'Create Anaconda environment'
2121
- script: |
2222
call activate CB

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ jobs:
112112
echo "COVERAGE_RCFILE=$(readlink -f .coveragerc)" >> "$GITHUB_ENV"
113113
if [[ -z $DPCFLAG ]]; then echo "SKLEARNEX_GCOV=1" >> "$GITHUB_ENV"; fi
114114
- name: apt-get
115-
run: sudo apt-get update && sudo apt-get install -y clang-format
115+
run: sudo apt-get update
116116
- name: dpcpp installation
117117
run: |
118118
# This CI system yields oneAPI dependencies from the oneDAL repository
@@ -252,7 +252,7 @@ jobs:
252252
python -m venv venv
253253
call .\venv\Scripts\activate.bat
254254
pip install --upgrade setuptools
255-
pip install cpufeature clang-format pyyaml
255+
pip install cpufeature pyyaml
256256
pip install -r dependencies-dev
257257
for /f "delims=" %%c in ('python -m pip freeze ^| grep numpy') do echo NUMPY_BUILD=%%c>> %GITHUB_ENV%
258258
- name: System info

dependencies-dev

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ numpy==2.3.0 ; python_version >= '3.11'
66
pybind11==2.13.6
77
cmake==4.0.3
88
setuptools==79.0.1
9+
clang-format==14.0.6

0 commit comments

Comments
 (0)