Skip to content

Commit 768b889

Browse files
committed
iwyu.yml: fixed macOS run
1 parent da8bab6 commit 768b889

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

.github/workflows/iwyu.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
matrix:
1515
# "opensuse/tumbleweed:latest" / "fedora:latest" / "debian:unstable" / "archlinux:latest"
1616
include:
17-
- os: macos-13
17+
- os: macos-15
1818
image: ""
1919
stdlib: libc++ # no libstdc++ on macOS
2020
mapping_file_opt: '-Xiwyu --mapping_file=$(realpath ./macos.imp)'
@@ -88,18 +88,22 @@ jobs:
8888
if: contains(matrix.os, 'macos')
8989
run: |
9090
brew install include-what-you-use pcre coreutils
91-
ln -s iwyu_tool.py /usr/local/bin/iwyu_tool
91+
# on Apple Silicon files are symlinked under /opt/homebrew/bin
92+
ln -s /opt/homebrew/bin/iwyu_tool.py /usr/local/bin/iwyu_tool
93+
ls -l /opt/homebrew/bin
9294
9395
# Fails on OpenSUSE:
9496
# Warning: Failed to restore: Tar failed with error: Unable to locate executable file: tar. Please verify either the file path exists or the file can be found within a directory specified by the PATH environment variable. Also check the file mode to verify the file is executable.
9597
# Also the shell is broken afterwards:
9698
# OCI runtime exec failed: exec failed: unable to start container process: exec: "sh": executable file not found in $PATH: unknown
99+
#
100+
# On macos-15 we need to perform the Python setup because the default installation is managed externally managed
97101
- name: Install Qt ${{ env.QT_VERSION }}
98102
uses: jurplel/install-qt-action@v4
99103
with:
100104
version: ${{ env.QT_VERSION }}
101105
modules: 'qtcharts'
102-
setup-python: 'false'
106+
setup-python: ${{ contains(matrix.os, 'macos') }}
103107
install-deps: false
104108
cache: true
105109

0 commit comments

Comments
 (0)