From 0f03b3f3aa55db827eecccb70b9d216c2fcb2524 Mon Sep 17 00:00:00 2001 From: James McCoy Date: Sun, 10 Jan 2021 23:27:44 -0500 Subject: [PATCH 1/2] ci(gha): brew upgrade before installing --- .github/workflows/ci.yml | 2 +- .github/workflows/release.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3653f04d5d..be4e973b22 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -58,8 +58,8 @@ jobs: run: | rm -f /usr/local/bin/2to3 brew update >/dev/null - brew install automake ccache cpanminus ninja brew upgrade + brew install automake ccache cpanminus ninja - name: Setup interpreter packages run: | diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index abcdd00721..577961ede3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -77,6 +77,7 @@ jobs: run: | rm -f /usr/local/bin/2to3 brew update >/dev/null + brew upgrade brew install automake ninja - name: Build release run: | From 6d67cf8647d251df4b1ded60b4ae3d49a1f73ad3 Mon Sep 17 00:00:00 2001 From: James McCoy Date: Mon, 11 Jan 2021 00:01:37 -0500 Subject: [PATCH 2/2] ci(gha): brew unlink gcc@8/@9 to fix upgrade issues --- .github/workflows/ci.yml | 2 ++ .github/workflows/release.yml | 1 + 2 files changed, 3 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index be4e973b22..34c3b2b4bb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -56,7 +56,9 @@ jobs: - name: Install brew packages if: matrix.os == 'osx' run: | + # Workaround brew issues rm -f /usr/local/bin/2to3 + brew unlink gcc@8 gcc@9 brew update >/dev/null brew upgrade brew install automake ccache cpanminus ninja diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 577961ede3..753142e555 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -76,6 +76,7 @@ jobs: - name: Install brew packages run: | rm -f /usr/local/bin/2to3 + brew unlink gcc@8 gcc@9 brew update >/dev/null brew upgrade brew install automake ninja