From 8829b0511c57bf33045db8f463703286d028cc61 Mon Sep 17 00:00:00 2001 From: WaluigiWare64 <68647953+WaluigiWare64@users.noreply.github.com> Date: Wed, 13 Jan 2021 13:56:06 +0000 Subject: 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 --- .github/workflows/build-macos.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to '.github/workflows') 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 -- cgit v1.2.3