From eb149027e09bfc7441c62254b98c040e9da738c7 Mon Sep 17 00:00:00 2001 From: Rui Chen Date: Thu, 15 Feb 2024 06:20:47 +0100 Subject: [PATCH 1/3] workflow(macos): fix pipeline issue Signed-off-by: Rui Chen --- .github/workflows/macos.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index d11a4d0..569af5a 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -13,8 +13,15 @@ jobs: runs-on: macos-latest steps: - uses: actions/checkout@v4 + - run: brew update - - run: brew install webp gdk-pixbuf meson ninja pkg-config + + - run: | + # https://github.com/actions/runner-images/issues/8838#issuecomment-1817486924 + brew link --overwrite python@3.12 + + brew install webp gdk-pixbuf meson ninja pkg-config + - run: meson setup build - run: meson compile -C build --verbose - run: meson test -C build --print-errorlogs From f59a7c19e9add491718a7ba16304b5eb077c6c7d Mon Sep 17 00:00:00 2001 From: Rui Chen Date: Thu, 15 Feb 2024 06:40:26 +0100 Subject: [PATCH 2/3] workflow(macos): remove `/usr/local/bin/2to3-3.12` instead Signed-off-by: Rui Chen --- .github/workflows/macos.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 569af5a..e6a0a1e 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -17,8 +17,8 @@ jobs: - run: brew update - run: | - # https://github.com/actions/runner-images/issues/8838#issuecomment-1817486924 - brew link --overwrite python@3.12 + # fix `brew link python@3.12` issue + rm -rf /usr/local/bin/2to3-3.12 brew install webp gdk-pixbuf meson ninja pkg-config From 7450c506e30e2f82e470ab0a24ae3eaffb5dea07 Mon Sep 17 00:00:00 2001 From: Rui Chen Date: Thu, 15 Feb 2024 06:44:12 +0100 Subject: [PATCH 3/3] workflow(macos): update workflow (merge brew step and fix `brew link` errors) Signed-off-by: Rui Chen --- .github/workflows/macos.yml | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index e6a0a1e..94b9313 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -14,11 +14,22 @@ jobs: steps: - uses: actions/checkout@v4 - - run: brew update + - name: Install dependencies via Homebrew + run: | + brew update - - run: | # fix `brew link python@3.12` issue - rm -rf /usr/local/bin/2to3-3.12 + + rm -f /usr/local/bin/2to3 + rm -f /usr/local/bin/idle3 + rm -f /usr/local/bin/pydoc3 + rm -f /usr/local/bin/python3 + rm -f /usr/local/bin/python3-config + rm -f /usr/local/bin/2to3-3.12 + rm -f /usr/local/bin/idle3.12 + rm -f /usr/local/bin/pydoc3.12 + rm -f /usr/local/bin/python3.12 + rm -f /usr/local/bin/python3.12-config brew install webp gdk-pixbuf meson ninja pkg-config