Skip to content

Commit b21ea9d

Browse files
committed
cI. fix order of macos unbreak action
1 parent e23c634 commit b21ea9d

File tree

1 file changed

+10
-15
lines changed

1 file changed

+10
-15
lines changed

.github/workflows/build.yml

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -136,11 +136,6 @@ jobs:
136136
echo "CC=clang-19" >> "$GITHUB_ENV"
137137
echo "CXX=clang++-19" >> "$GITHUB_ENV"
138138
echo "OBJC=clang-19" >> "$GITHUB_ENV"
139-
# Patch the libstd++ library, see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=115119
140-
# This is a dirty workaround, but it is needed, since gcc 14.2 (where this was patched usptream) is not easily available
141-
# If we use the oracular (Ubuntu 24.10) repos, we could install gcc 14.2, but clang-19 isn't compatible with that
142-
# TODO: remove this, after it works again
143-
sudo patch -p1 /usr/include/c++/14/bits/unicode.h .github/patches/gcc_14_2.diff
144139
145140
- name: Setup GCC (Linux)
146141
if: matrix.config.os == 'ubuntu' && matrix.config.use-clang == false
@@ -149,6 +144,16 @@ jobs:
149144
version: 14
150145
platform: x64
151146

147+
- name: Unbreak Python in GHA (MacOS 13 image)
148+
if: matrix.config.os == 'macos' && matrix.config.os-version == 13
149+
run: |
150+
# TODO: remove this, after it works again
151+
# A workaround for "The `brew link` step did not complete successfully" error.
152+
# See e.g. https://github.com/Homebrew/homebrew-core/issues/165793#issuecomment-1991817938
153+
find /usr/local/bin -lname '*/Library/Frameworks/Python.framework/*' -delete
154+
sudo rm -rf /Library/Frameworks/Python.framework/
155+
brew install --force python3 && brew unlink python3 && brew unlink python3 && brew link --overwrite python3
156+
152157
- name: Setup Clang (MacOS)
153158
if: matrix.config.os == 'macos'
154159
run: |
@@ -165,16 +170,6 @@ jobs:
165170
echo "CXX_LD=lld" >> "$GITHUB_ENV"
166171
echo "OBJC_LD=lld" >> "$GITHUB_ENV"
167172
168-
- name: Unbreak Python in GHA (MacOS 13 image)
169-
if: matrix.config.os == 'macos' && matrix.config.os-version == 13
170-
run: |
171-
# TODO: remove this, after it works again
172-
# A workaround for "The `brew link` step did not complete successfully" error.
173-
# See e.g. https://github.com/Homebrew/homebrew-core/issues/165793#issuecomment-1991817938
174-
find /usr/local/bin -lname '*/Library/Frameworks/Python.framework/*' -delete
175-
sudo rm -rf /Library/Frameworks/Python.framework/
176-
brew install --force python3 && brew unlink python3 && brew unlink python3 && brew link --overwrite python3
177-
178173
- name: Setup meson (MacOS)
179174
if: matrix.config.os == 'macos'
180175
run: |

0 commit comments

Comments
 (0)