Skip to content

Commit

Permalink
Merge pull request #430 from jhlegarreta/FixMacOSGHAToolchain
Browse files Browse the repository at this point in the history
ENH: Fix macOS GHA toolchain
  • Loading branch information
thewtex authored Nov 7, 2024
2 parents 58b5352 + 38d345a commit 1525fe0
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 12 deletions.
23 changes: 14 additions & 9 deletions .github/workflows/build-test-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ jobs:
cmake-build-type: "MinSizeRel"

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
path: Ex

- name: Set up Python 3.9
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: 3.9

Expand All @@ -44,6 +44,11 @@ jobs:
- name: Get specific version of CMake, Ninja
uses: lukka/get-cmake@v3.24.2

- name: Specific XCode version
if: matrix.os == 'macos-13'
run: |
sudo xcode-select -s "/Applications/Xcode_14.3.1.app"
- name: Download ITK
run: |
cd ..
Expand Down Expand Up @@ -146,12 +151,12 @@ jobs:
cmake-build-type: "MinSizeRel"

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
path: Ex

- name: Set up Python 3.9
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: 3.9

Expand Down Expand Up @@ -229,12 +234,12 @@ jobs:
strategy:
max-parallel: 3
matrix:
os: [ubuntu-22.04, windows-2022, macos-12]
os: [ubuntu-22.04, windows-2022, macos-13]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Python 3.9
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: 3.9

Expand Down Expand Up @@ -266,13 +271,13 @@ jobs:
cmake-build-type: "Release"

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
path: Ex
submodules: recursive

- name: Set up Python 3.9
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: 3.9

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
# Full git history is needed to get a proper
# list of changed files within `super-linter`
Expand All @@ -17,12 +17,12 @@ jobs:
uses: InsightSoftwareConsortium/ITKClangFormatLinterAction@master

- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: 3.9

- name: Lint Python
uses: github/super-linter@v4
uses: github/super-linter@v7
env:
VALIDATE_ALL_CODEBASE: false
VALIDATE_PYTHON_BLACK: true
Expand Down

0 comments on commit 1525fe0

Please sign in to comment.