Skip to content

Commit

Permalink
Switch to GitHub Apple Silicon runner
Browse files Browse the repository at this point in the history
Signed-off-by: Matthew J. Milner <[email protected]>
  • Loading branch information
matterhorn103 committed Dec 16, 2024
1 parent 53c78fd commit 1fa2c12
Showing 1 changed file with 3 additions and 10 deletions.
13 changes: 3 additions & 10 deletions .github/workflows/build_mac.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,18 @@ jobs:
config:
- {
name: "macOS Intel", artifact: "macOS-x86_64.dmg",
os: macos-latest,
os: macos-13,
cc: "clang", cxx: "clang++",
build_type: "Release",
cmake_flags: "-G Ninja -DCMAKE_OSX_ARCHITECTURES='x86_64'",
cpack_flags: "-G DragNDrop",
}
- {
name: "macOS Apple Silicon", artifact: "macOS-arm64.dmg",
os: [self-hosted, macOS],
os: macos-latest,
cc: "clang", cxx: "clang++",
build_type: "Release",
cmake_flags: "-G Ninja -DCMAKE_PREFIX_PATH=/opt/homebrew/Cellar/qt@5/5.15.5_1/lib/cmake/Qt5",
cmake_flags: "-G Ninja -DCMAKE_OSX_ARCHITECTURES='arm64'",
cpack_flags: "-G DragNDrop",
}
- {
Expand All @@ -52,12 +52,7 @@ jobs:
steps:

- name: Install Dependencies
if: matrix.config.name != 'macOS Apple Silicon'
run: brew install ninja eigen glew

- name: Set PATH (self-hosted)
if: matrix.config.name == 'macOS Apple Silicon'
run: export PATH=/opt/homebrew/bin:$PATH

- name: Checkout openchemistry
uses: actions/checkout@v4
Expand Down Expand Up @@ -108,8 +103,6 @@ jobs:
path: openchemistry/molecules

- name: Install Qt
# Only if not self-hosted
if: matrix.config.name != 'macOS Apple Silicon'
uses: jurplel/install-qt-action@v4
with:
version: ${{ env.QT_VERSION }}
Expand Down

0 comments on commit 1fa2c12

Please sign in to comment.