diff options
| author | WaluigiWare64 <68647953+WaluigiWare64@users.noreply.github.com> | 2021-01-13 13:56:06 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-13 14:56:06 +0100 |
| commit | 8829b0511c57bf33045db8f463703286d028cc61 (patch) | |
| tree | 6dc6a2b994b71f36ee5d00a04971ae7a3c60845a | |
| parent | c109235d0114a6b4367e75ac72ae3ee05856475d (diff) | |
Change all mentions of qt5 to qt@5 on macOS (#937)
* Change all mentions of qt5 to qt@5 on macOS
* Use temporary workaround to get macOS brew updating
https://github.com/actions/virtual-environments/issues/2322#issuecomment-749211076
* Don't install CMake, it is already installed in the macOS runner
| -rw-r--r-- | .github/workflows/build-macos.yml | 4 | ||||
| -rw-r--r-- | README.md | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml index 59fb4bc..2174e7e 100644 --- a/.github/workflows/build-macos.yml +++ b/.github/workflows/build-macos.yml @@ -21,7 +21,9 @@ jobs: - name: Install dependencies working-directory: ${{runner.workspace}} run: | - brew install cmake sdl2 qt5 libslirp libarchive + rm -rf /usr/local/bin/2to3 # Temporary workaround suggested here - https://github.com/actions/virtual-environments/issues/2322#issuecomment-749211076 + brew update + brew install sdl2 qt@5 libslirp libarchive - name: Create build environment run: mkdir ${{runner.workspace}}/build - name: Configure @@ -86,7 +86,7 @@ If everything went well, melonDS should now be in the `dist` folder. ### macOS: 1. Install the [Homebrew Package Manager](https://brew.sh) -2. Install dependencies: `brew install git pkg-config cmake sdl2 qt5 libslirp libarchive` +2. Install dependencies: `brew install git pkg-config cmake sdl2 qt@5 libslirp libarchive` 3. Compile: ```zsh git clone https://github.com/Arisotura/melonDS.git |