aboutsummaryrefslogtreecommitdiff
path: root/.github/workflows
diff options
context:
space:
mode:
authorWaluigiWare64 <68647953+WaluigiWare64@users.noreply.github.com>2021-01-13 13:56:06 +0000
committerGitHub <noreply@github.com>2021-01-13 14:56:06 +0100
commit8829b0511c57bf33045db8f463703286d028cc61 (patch)
tree6dc6a2b994b71f36ee5d00a04971ae7a3c60845a /.github/workflows
parentc109235d0114a6b4367e75ac72ae3ee05856475d (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
Diffstat (limited to '.github/workflows')
-rw-r--r--.github/workflows/build-macos.yml4
1 files changed, 3 insertions, 1 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