Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DEV: Enable macOS-ARM, remove extra checkout steps #848

Merged
merged 4 commits into from
Feb 9, 2024
Merged

DEV: Enable macOS-ARM, remove extra checkout steps #848

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
17da945
DEV: Enable Apple ARM64 CI Support
imikejackson Feb 5, 2024
a74f294
Simplified setting up path for github actions
JDuffeyBQ Feb 9, 2024
85b2dae
Removed duplicate checkout step
JDuffeyBQ Feb 9, 2024
d9ad940
Merged macos-arm64 CI build into macos.yml
JDuffeyBQ Feb 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/asan.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ jobs:
uses: actions/checkout@v3
with:
submodules: true
- uses: actions/checkout@v4
- name: Set up Python
uses: actions/setup-python@v4
with:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ jobs:
uses: actions/checkout@v3
with:
submodules: true
- uses: actions/checkout@v4
- name: Set up Python
uses: actions/setup-python@v4
with:
Expand Down
20 changes: 16 additions & 4 deletions .github/workflows/macos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,25 @@ jobs:
matrix:
os:
- macos-11
- macos-14
include:
- os: macos-11
preset: ci-macos-x64
- os: macos-14
preset: ci-macos-arm64
runs-on: ${{matrix.os}}
steps:
- name: Checkout
uses: actions/checkout@v3
with:
submodules: true
- uses: actions/checkout@v4
- name: Checkout vcpkg
run: |
git clone https://www.github.com/microsoft/vcpkg && cd vcpkg && ./bootstrap-vcpkg.sh
VCPKG_INSTALLATION_ROOT=${{github.workspace}}/vcpkg
echo "$VCPKG_INSTALLATION_ROOT" >> $GITHUB_PATH
echo "VCPKG_INSTALLATION_ROOT=$VCPKG_INSTALLATION_ROOT" >> "$GITHUB_ENV"
if: matrix.os == 'macos-14'
- name: Set up Python
uses: actions/setup-python@v4
with:
Expand Down Expand Up @@ -57,10 +69,10 @@ jobs:
-source "https://nuget.pkg.github.com/BlueQuartzSoftware/index.json"
- name: Configure
run: |
cmake --preset ci-macos-x64 ${{github.workspace}}
cmake --preset ${{matrix.preset}} ${{github.workspace}}
- name: Build
run: |
cmake --build --preset ci-macos-x64
cmake --build --preset ${{matrix.preset}}
- name: Test
run: |
ctest --preset ci-macos-x64
ctest --preset ${{matrix.preset}}
Loading