Skip to content

Commit

Permalink
Merge pull request #35 from mseng10/update-github-actions
Browse files Browse the repository at this point in the history
  • Loading branch information
thewtex authored Nov 20, 2020
2 parents c452b8c + f9d9ad5 commit 45fa2d6
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 10 deletions.
19 changes: 11 additions & 8 deletions .github/workflows/build-test-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,17 @@ jobs:
- os: ubuntu-18.04
c-compiler: "gcc"
cxx-compiler: "g++"
itk-git-tag: "v5.1.0"
itk-git-tag: "v5.1.1"
cmake-build-type: "MinSizeRel"
- os: windows-2019
c-compiler: "cl.exe"
cxx-compiler: "cl.exe"
itk-git-tag: "v5.1.0"
itk-git-tag: "v5.1.1"
cmake-build-type: "Release"
- os: macos-10.15
c-compiler: "clang"
cxx-compiler: "clang++"
itk-git-tag: "v5.1.0"
itk-git-tag: "v5.1.1"
cmake-build-type: "MinSizeRel"

steps:
Expand Down Expand Up @@ -100,6 +100,9 @@ jobs:
set(dashboard_no_clean 1)
set(ENV{CC} ${{ matrix.c-compiler }})
set(ENV{CXX} ${{ matrix.cxx-compiler }})
if(WIN32)
set(ENV{PATH} "\${CTEST_DASHBOARD_ROOT}/ITK-build/bin;\$ENV{PATH}")
endif()
set(dashboard_cache "
ITK_DIR:PATH=\${CTEST_DASHBOARD_ROOT}/ITK-build
BUILD_TESTING:BOOL=ON
Expand Down Expand Up @@ -128,9 +131,9 @@ jobs:
strategy:
max-parallel: 2
matrix:
python-version: [35, 36, 37, 38]
python-version: [36, 37, 38, 39]
include:
- itk-python-git-tag: "v5.1.0.post2"
- itk-python-git-tag: "v5.1.1.post1"

steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -166,7 +169,7 @@ jobs:
max-parallel: 2
matrix:
include:
- itk-python-git-tag: "v5.1.0.post2"
- itk-python-git-tag: "v5.1.1.post1"

steps:
- uses: actions/checkout@v2
Expand All @@ -193,9 +196,9 @@ jobs:
strategy:
max-parallel: 2
matrix:
python-version-minor: [5, 6, 7, 8]
python-version-minor: [6, 7, 8, 9]
include:
- itk-python-git-tag: "v5.1.0.post2"
- itk-python-git-tag: "v5.1.1.post1"

steps:
- uses: actions/checkout@v2
Expand Down
13 changes: 13 additions & 0 deletions .github/workflows/clang-format-linter.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
name: clang-format linter

on: [push,pull_request]

jobs:
lint:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v1
with:
fetch-depth: 1
- uses: InsightSoftwareConsortium/ITKClangFormatLinterAction@master
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

setup(
name='itk-ioscanco',
version='0.6.1',
version='0.7.0',
author='Matt McCormick',
author_email='[email protected]',
packages=['itk'],
Expand Down Expand Up @@ -44,6 +44,6 @@
keywords='ITK InsightToolkit',
url=r'https://itk.org/',
install_requires=[
r'itk>=5.1.0.post2'
r'itk>=5.1.1'
]
)

0 comments on commit 45fa2d6

Please sign in to comment.