Skip to content

Commit 50aef61

Browse files
dzenanzdzenanz
authored
Merge pull request #171 from InsightSoftwareConsortium/linterGitAttributes
ENH: Add .gitattributes file for linter action
2 parents fb886e0 + ca1c21c commit 50aef61

3 files changed

Lines changed: 57 additions & 58 deletions

File tree

‎.github/workflows/build-test-package.yml‎

Lines changed: 35 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,9 @@ on:
99
- main
1010

1111
env:
12-
# v6.0a02
13-
itk-git-tag: "v6.0a02"
14-
itk-wheel-tag: "v6.0a02"
15-
# v6.0a02 + fixes
16-
itk-python-package-tag: "v6.0a02"
12+
itk-git-tag: "v6.0b02"
13+
itk-wheel-tag: "v6.0b02"
14+
itk-python-package-tag: "v6.0b02"
1715
itk-python-package-org: "InsightSoftwareConsortium"
1816

1917
jobs:
@@ -22,8 +20,8 @@ jobs:
2220
strategy:
2321
max-parallel: 3
2422
matrix:
25-
# runners macos-13 is x86_64, macos-15 is arm64 by default
26-
os: [ubuntu-24.04, windows-2022, macos-13, macos-15]
23+
# macos-15 is arm64 by default
24+
os: [ubuntu-24.04, windows-2022, macos-15-intel, macos-15]
2725
include:
2826
- os: ubuntu-24.04
2927
c-compiler: "gcc"
@@ -33,28 +31,28 @@ jobs:
3331
c-compiler: "cl.exe"
3432
cxx-compiler: "cl.exe"
3533
cmake-build-type: "Release"
36-
- os: macos-13
34+
- os: macos-15-intel
3735
c-compiler: "clang"
3836
cxx-compiler: "clang++"
3937
cmake-build-type: "MinSizeRel"
40-
deployment_target: '10.9'
38+
deployment_target: '13.0'
4139
- os: macos-15
4240
c-compiler: "clang"
4341
cxx-compiler: "clang++"
4442
cmake-build-type: "MinSizeRel"
4543
deployment_target: '13.0'
4644

4745
steps:
48-
- uses: actions/checkout@v4.2.2
46+
- uses: actions/checkout@v7.0.1
4947

5048
- name: Free Disk Space (Ubuntu)
5149
if: matrix.os == 'ubuntu-24.04'
52-
uses: jlumbroso/free-disk-space@v1.3.1
50+
uses: jlumbroso/free-disk-space@v2.0.0
5351
with:
5452
large-packages: false
5553

5654
- name: Set up Python 3.11
57-
uses: actions/setup-python@v5.4.0
55+
uses: actions/setup-python@v7.0.0
5856
with:
5957
python-version: "3.11"
6058

@@ -65,17 +63,12 @@ jobs:
6563
python -m pip install cookiecutter
6664
6765
- name: Get specific version of CMake, Ninja
68-
uses: lukka/get-cmake@v3.31.5
69-
70-
- name: 'Specific XCode version 14.3.1'
71-
if: matrix.os == 'macos-13'
72-
run: |
73-
sudo xcode-select -s "/Applications/Xcode_14.3.1.app"
66+
uses: lukka/get-cmake@v4.4.2
7467

75-
- name: 'Specific XCode version 16.2'
76-
if: matrix.os == 'macos-15'
68+
- name: 'Specific XCode version 16.4'
69+
if: startsWith(matrix.os, 'macos-15')
7770
run: |
78-
sudo xcode-select -s "/Applications/Xcode_16.2.app"
71+
sudo xcode-select -s "/Applications/Xcode_16.4.app"
7972
8073
- name: Download ITK
8174
run: |
@@ -180,16 +173,12 @@ jobs:
180173
python-version: ["39", "310", "311","312","313"]
181174

182175
steps:
183-
- uses: actions/checkout@v4.2.2
176+
- uses: actions/checkout@v7.0.1
184177

185-
- name: 'Free up disk space'
186-
run: |
187-
# Workaround for https://github.com/actions/virtual-environments/issues/709
188-
df -h
189-
sudo apt-get clean
190-
sudo rm -rf "/usr/local/share/boost"
191-
sudo rm -rf "$AGENT_TOOLSDIRECTORY"
192-
df -h
178+
- name: Free Disk Space (Ubuntu)
179+
uses: jlumbroso/free-disk-space@v2.0.0
180+
with:
181+
large-packages: false
193182

194183
- name: 'Fetch build dependencies'
195184
shell: bash
@@ -198,12 +187,12 @@ jobs:
198187
unzstd --version
199188
200189
- name: Set up Python 3.11
201-
uses: actions/setup-python@v5.4.0
190+
uses: actions/setup-python@v7.0.0
202191
with:
203192
python-version: "3.11"
204193

205194
- name: Get specific version of CMake, Ninja
206-
uses: lukka/get-cmake@v3.31.5
195+
uses: lukka/get-cmake@v4.4.2
207196

208197
- name: Evaluate template
209198
shell: bash
@@ -230,35 +219,35 @@ jobs:
230219
done
231220
232221
- name: Publish Python package as GitHub Artifact
233-
uses: actions/upload-artifact@v4.6.0
222+
uses: actions/upload-artifact@v7.0.1
234223
with:
235224
name: LinuxWheel3${{ matrix.python-version }}
236225
path: Evaluated/ITKModuleTemplate/dist
237226

238227
build-macos-python-packages:
239-
runs-on: macos-13
228+
runs-on: macos-15-intel
240229
strategy:
241230
max-parallel: 2
242231
matrix:
243232
python3-minor-version: ["9", "10", "11", "12", "13"]
244233

245234
steps:
246-
- uses: actions/checkout@v4.2.2
235+
- uses: actions/checkout@v7.0.1
247236

248-
- name: 'Specific XCode version'
237+
- name: 'Specific XCode version 16.4'
249238
run: |
250-
sudo xcode-select -s "/Applications/Xcode_14.3.1.app"
239+
sudo xcode-select -s "/Applications/Xcode_16.4.app"
251240
252241
- name: Get specific version of CMake, Ninja
253-
uses: lukka/get-cmake@v3.31.5
242+
uses: lukka/get-cmake@v4.4.2
254243

255244
- name: 'Fetch build script'
256245
run: |
257246
curl -L https://raw.githubusercontent.com/InsightSoftwareConsortium/ITKPythonPackage/${{ env.itk-python-package-tag }}/scripts/macpython-download-cache-and-build-module-wheels.sh -O
258247
chmod u+x macpython-download-cache-and-build-module-wheels.sh
259248
260249
- name: Set up Python 3.11
261-
uses: actions/setup-python@v5.4.0
250+
uses: actions/setup-python@v7.0.0
262251
with:
263252
python-version: "3.11"
264253

@@ -275,12 +264,12 @@ jobs:
275264
export ITK_PACKAGE_VERSION=${{ env.itk-wheel-tag }}
276265
export ITKPYTHONPACKAGE_TAG=${{ env.itk-python-package-tag }}
277266
export ITKPYTHONPACKAGE_ORG=${{ env.itk-python-package-org }}
278-
# For Xcode 16.2, the recommended "MACOSX_DEPLOYMENT_TARGET" is "13.0"; this means your application should be built to run on macOS Ventura (version 13.0) or later.
267+
# For Xcode 16.4, the recommended "MACOSX_DEPLOYMENT_TARGET" is "13.0"; this means your application should be built to run on macOS Ventura (version 13.0) or later.
279268
export MACOSX_DEPLOYMENT_TARGET=${{ matrix.deployment_target || '13.0' }}
280269
../../macpython-download-cache-and-build-module-wheels.sh "3.${{ matrix.python3-minor-version }}"
281270
282271
- name: Publish Python package as GitHub Artifact
283-
uses: actions/upload-artifact@v4.6.0
272+
uses: actions/upload-artifact@v7.0.1
284273
with:
285274
name: MacOSWheel3${{ matrix.python3-minor-version }}
286275
path: Evaluated/ITKModuleTemplate/dist
@@ -293,23 +282,23 @@ jobs:
293282
python-version-minor: ["9", "10", "11"]
294283

295284
steps:
296-
- uses: actions/checkout@v4.2.2
285+
- uses: actions/checkout@v7.0.1
297286

298287
- name: 'Install Python'
299288
run: |
300289
$pythonArch = "64"
301290
$pythonVersion = "3.${{ matrix.python-version-minor }}"
302291
iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/scikit-build/scikit-ci-addons/master/windows/install-python.ps1'))
303292
304-
- uses: actions/setup-python@v5.4.0
293+
- uses: actions/setup-python@v7.0.0
305294
with:
306295
python-version: '3.x'
307296

308297
- name: Get specific version of CMake, Ninja
309-
uses: lukka/get-cmake@v3.31.5
298+
uses: lukka/get-cmake@v4.4.2
310299

311300
- name: Set up Python 3.11/
312-
uses: actions/setup-python@v5.4.0
301+
uses: actions/setup-python@v7.0.0
313302
with:
314303
python-version: "3.11"
315304

@@ -351,7 +340,7 @@ jobs:
351340
C:\Python3${{ matrix.python-version-minor }}-x64\python.exe C:\P\IPP\scripts\windows_build_module_wheels.py --py-envs "3${{ matrix.python-version-minor }}-x64"
352341
353342
- name: Publish Python package as GitHub Artifact
354-
uses: actions/upload-artifact@v4.6.0
343+
uses: actions/upload-artifact@v7.0.1
355344
with:
356345
name: WindowsWheel3.${{ matrix.python-version-minor }}
357346
path: Evaluated/ITKModuleTemplate/dist

‎.github/workflows/clang-format-linter.yml‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎{{cookiecutter.project_name}}/.gitattributes‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# Custom attribute to mark sources as using our C++/C code style.
2+
[attr]our-c-style whitespace=tab-in-indent,no-lf-at-eof hooks.style=KWStyle,clangformat
3+
*.c our-c-style
4+
*.h our-c-style
5+
*.cxx our-c-style
6+
*.hxx our-c-style
7+
*.txx our-c-style
8+
9+
# Custom attribute to mark sources as using our CMake code style.
10+
[attr]our-cmake-style whitespace=tab-in-indent,no-lf-at-eof hooks.style=cmakeformat
11+
*.txt our-cmake-style
12+
*.cmake our-cmake-style
13+
*.wrap our-cmake-style
14+
CMakeLists.txt our-cmake-style
15+
16+
# ExternalData content links must have LF newlines
17+
*.md5 crlf=input
18+
*.sha512 crlf=input
19+
*.cid crlf=input
20+
21+
# ghostflow-director GitHub automatic check for maximum repository file size
22+
* hooks-max-size=100000

0 commit comments

Comments
 (0)