Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MacOS workflow: Install harfbuzz normally again #2622

Merged
merged 6 commits into from
Sep 24, 2023
Merged

MacOS workflow: Install harfbuzz normally again #2622

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
280a1a2
MacOS workflow: Install harfbuzz normally again
tobbi Sep 4, 2023
d96a52f
Address https://github.com/SuperTux/supertux/pull/2622#pullrequestrev…
tobbi Sep 4, 2023
368dbba
Address https://github.com/SuperTux/supertux/pull/2622#pullrequestrev…
tobbi Sep 4, 2023
ba4422e
Address more comments
tobbi Sep 23, 2023
8197230
Get rid of temporary harfbuzz fixes
tobbi Sep 23, 2023
c6bf2c8
Install harfbuzz
tobbi Sep 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions .github/workflows/macos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,13 @@ jobs:
- name: Install macos dependencies
if: ${{ matrix.os == 'macos-11' }}
run: |
# See https://github.com/orgs/Homebrew/discussions/4735
# and https://github.com/actions/runner-images/issues/8078
brew uninstall --ignore-dependencies harfbuzz
brew install --build-from-source harfbuzz
brew install cmake googletest bash rename libogg libvorbis glew\
openal-soft sdl2 sdl2_image sdl2_ttf freetype harfbuzz \
brew install cmake googletest bash rename libogg libvorbis glew \
openal-soft sdl2 sdl2_image sdl2_ttf freetype harfbuzz \
fribidi glib gtk-doc glbinding libraqm glm zlib
install_name_tool -change \
'@rpath/libsharpyuv.0.dylib' \
/usr/local/opt/webp/lib/libsharpyuv.0.dylib \
/usr/local/opt/webp/lib/libwebp.7.dylib

# Something funky happens with freetype if mono is left
sudo mv /Library/Frameworks/Mono.framework \
Expand Down Expand Up @@ -122,8 +122,8 @@ jobs:
aws_key_id: ${{ secrets.CI_DOWNLOAD_ACCESS_KEY_ID }}
aws_secret_access_key: ${{ secrets.CI_DOWNLOAD_SECRET_ACCESS_KEY }}
source_dir: 'build/upload'
destination_dir: "${{ github.sha }}/gh-actions/${{ matrix.os }}-${{ matrix.arch }}/${{ github.run_id }}"
destination_dir: "${{ github.sha }}/gh-actions/${{ matrix.os }}-${{ matrix.arch }}/${{ github.run_id }}"

- name: Post uploaded file
if: matrix.release && env.DOWNLOAD_APIKEY != null
working-directory: build
Expand Down
Loading