From 34018519defc3a7eae46473d7e20dff96b612c1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=A4rkl?= Date: Sun, 8 Jan 2023 12:04:36 +0100 Subject: [PATCH] Cleanup and fix macOS CI (#3070) 2to3 has some suffix now and workarounds are no longer necessary. --- .github/workflows/ci.yml | 5 +---- scripts/Brewfile | 4 +++- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 36ff9aa6..86a9ce1d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -86,11 +86,8 @@ jobs: if: contains(matrix.os, 'macos') run: | cd scripts - rm '/usr/local/bin/2to3' # symlink to some kind of existing python2.7 installation conflicts with brew python3 which gets installed as indirect dependency - brew update --preinstall # temporary workaround for https://github.com/Homebrew/homebrew-bundle/issues/751 + rm /usr/local/bin/2to3* # symlink to some kind of existing python2.7 installation conflicts with brew python3 which gets installed as indirect dependency brew bundle - brew install coreutils - brew install pkg-config - name: py dependencies run: | python3 -m pip install -U pip==21.3.1 diff --git a/scripts/Brewfile b/scripts/Brewfile index dc80bdbc..fb6bc93c 100644 --- a/scripts/Brewfile +++ b/scripts/Brewfile @@ -3,4 +3,6 @@ brew "ccache" brew "openssl" brew "xz" brew "llvm" -brew "meson" \ No newline at end of file +brew "meson" +brew "coreutils" +brew "pkg-config"