Skip to content

Commit b54c03a

Browse files
authored
Merge pull request #140 from cortex-command-community/osxcross-pkg-config-fix
Fix Mac build
2 parents c9ee2b1 + 8aee029 commit b54c03a

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

.github/workflows/meson.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ jobs:
8484
sudo pip install meson
8585
8686
- name: ccache
87-
uses: hendrikmuhs/ccache-action@v1.2.11 # Keep this at 1.2.11 until #181 or #182 is closed
87+
uses: hendrikmuhs/ccache-action@v1
8888
with:
8989
key: ${{ github.job }}-${{ matrix.os }}
9090

@@ -175,6 +175,8 @@ jobs:
175175
env:
176176
OSXCROSS_MACPORTS_MIRROR: "https://packages.macports.org"
177177
run: |
178+
echo "::group::Installing pkg-config"
179+
sudo apt install pkg-config
178180
echo "::group::Installing mac deps"
179181
omp install libsdl2 onetbb lz4 libpng minizip luajit flac
180182
echo "OSXCROSS_PKG_CONFIG_PATH=${{env.OSXCROSS_TARGET}}/macports/pkgs/opt/local/libexec/onetbb/lib/pkgconfig" >> $GITHUB_ENV
@@ -191,7 +193,7 @@ jobs:
191193
github_token: ${{ secrets.GITHUB_TOKEN }}
192194

193195
- name: ccache
194-
uses: hendrikmuhs/ccache-action@v1.2.11 # Keep this at 1.2.11 until #181 or #182 is closed
196+
uses: hendrikmuhs/ccache-action@v1
195197
with:
196198
key: ${{ github.job }}-${{ matrix.os }}
197199

0 commit comments

Comments
 (0)