Skip to content

Commit

Permalink
MacOS workflow: Install harfbuzz normally again (#2622)
Browse files Browse the repository at this point in the history
* MacOS workflow: Install harfbuzz normally again

See
https://github.com/orgs/Homebrew/discussions/4735#discussioncomment-6902146

* Address #2622 (review)

* Address #2622 (review)

* Address more comments

* Get rid of temporary harfbuzz fixes

* Install harfbuzz
  • Loading branch information
tobbi authored Sep 24, 2023
1 parent 282ae60 commit fda1823
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/macos.yml
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

0 comments on commit fda1823

Please sign in to comment.