Skip to content

Commit

Permalink
workflows: improve macOS workflow
Browse files Browse the repository at this point in the history
Use scripts/mac-toolchain-build hash as the toolchain cache key, so it will be updated automatically.
Fix meson build failure.
  • Loading branch information
galad87 committed Apr 30, 2024
1 parent 744c022 commit 17d259f
Showing 1 changed file with 11 additions and 7 deletions.
18 changes: 11 additions & 7 deletions .github/workflows/mac.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,39 +11,43 @@ jobs:
name: Build on macOS
runs-on: macos-14
env:
DEVELOPER_DIR: /Applications/Xcode_15.2.app/Contents/Developer
DEVELOPER_DIR: /Applications/Xcode_15.3.app/Contents/Developer
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: '3.12.3'

- name: Toolchain Cache
id: mac-toolchain-arm
id: mac-toolchain
uses: actions/cache@v4
with:
path: ~/mac-toolchain
key: mac-toolchain-arm
key: ${{ runner.os }}-${{ runner.arch }}-toolchain-${{ hashFiles('**/scripts/mac-toolchain-build') }}

- name: Cargo-C Toolchain Cache
id: mac-cargo-c-toolchain-arm
id: mac-cargo-c-toolchain
uses: actions/cache@v4
with:
path: |
~/.cargo/bin/cargo-capi
~/.cargo/bin/cargo-cbuild
~/.cargo/bin/cargo-cinstall
key: mac-cargo-c-toolchain-arm
key: ${{ runner.os }}-${{ runner.arch }}-cargo-c-toolchain

- name: Setup Environment
run: |
echo ~/mac-toolchain/bin >> $GITHUB_PATH
rustup target add x86_64-apple-darwin
- name: Setup Toolchain
if: steps.mac-toolchain-arm.outputs.cache-hit != 'true'
if: steps.mac-toolchain.outputs.cache-hit != 'true'
run: |
pip install setuptools
scripts/mac-toolchain-build ~/mac-toolchain
- name: Setup Cargo-C Toolchain
if: steps.mac-cargo-c-toolchain-arm.outputs.cache-hit != 'true'
if: steps.mac-cargo-c-toolchain.outputs.cache-hit != 'true'
run: |
cargo install cargo-c
Expand Down

0 comments on commit 17d259f

Please sign in to comment.