Skip to content

Commit 64bb86d

Browse files
committed
[DATALAD RUNCMD] Regenerate workflows for macOS ARM64 support
=== Do not change lines below === { "chain": [], "cmd": "make -C .github/workflows/template", "exit": 0, "extra_inputs": [], "inputs": [], "outputs": [], "pwd": "." } ^^^ Do not change lines above ^^^
1 parent 5750bf9 commit 64bb86d

2 files changed

Lines changed: 20 additions & 2 deletions

File tree

.github/workflows/build-macos-arm64.yaml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,16 @@ jobs:
4545
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4646

4747
- name: Set up system
48-
run: brew install libmagic pkg-config rsync
48+
run: |
49+
brew install libmagic pkg-config rsync
50+
# On ARM64 Macs, Homebrew uses /opt/homebrew instead of /usr/local
51+
# Set paths so that the Haskell magic package can find libmagic
52+
HOMEBREW_PREFIX="$(brew --prefix)"
53+
{
54+
echo "PKG_CONFIG_PATH=${HOMEBREW_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH:-}"
55+
echo "LIBRARY_PATH=${HOMEBREW_PREFIX}/lib:${LIBRARY_PATH:-}"
56+
echo "C_INCLUDE_PATH=${HOMEBREW_PREFIX}/include:${C_INCLUDE_PATH:-}"
57+
} >> "$GITHUB_ENV"
4958
5059
- name: Setup Haskell
5160
uses: haskell-actions/setup@v2

.github/workflows/build-macos.yaml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,16 @@ jobs:
4545
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4646

4747
- name: Set up system
48-
run: brew install libmagic pkg-config rsync
48+
run: |
49+
brew install libmagic pkg-config rsync
50+
# On ARM64 Macs, Homebrew uses /opt/homebrew instead of /usr/local
51+
# Set paths so that the Haskell magic package can find libmagic
52+
HOMEBREW_PREFIX="$(brew --prefix)"
53+
{
54+
echo "PKG_CONFIG_PATH=${HOMEBREW_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH:-}"
55+
echo "LIBRARY_PATH=${HOMEBREW_PREFIX}/lib:${LIBRARY_PATH:-}"
56+
echo "C_INCLUDE_PATH=${HOMEBREW_PREFIX}/include:${C_INCLUDE_PATH:-}"
57+
} >> "$GITHUB_ENV"
4958
5059
- name: Setup Haskell
5160
uses: haskell-actions/setup@v2

0 commit comments

Comments
 (0)