From 83cf87b1394df34d6269bad4220bd37b8d482805 Mon Sep 17 00:00:00 2001 From: Drew Weymouth Date: Wed, 5 Jun 2024 09:42:40 -0700 Subject: [PATCH] try moving GH Actions Mac workflow back to Homebrew --- .github/workflows/build-macos.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml index 853af44..c6938e3 100644 --- a/.github/workflows/build-macos.yml +++ b/.github/workflows/build-macos.yml @@ -15,8 +15,10 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Set up MacPorts - uses: melusina-org/setup-macports@v1 + - name: Set up Xcode + uses: maxim-lobanov/setup-xcode@v1 + with: + xcode-version: latest - name: Set up Go uses: actions/setup-go@v4 @@ -24,13 +26,10 @@ jobs: go-version: '1.21' - name: Install Dependencies - run: sudo port install mpv +libmpv && sudo port install dylibbundler - - - name: Setup path - run: export C_INCLUDE_PATH=/usr/local/include:$C_INCLUDE_PATH && export LIBRARY_PATH=/usr/local/lib:$LIBRARY_PATH + run: brew install --force mpv && brew install --force dylibbundler - name: Build - run: CGO_CFLAGS="-I/usr/local/include" go build + run: CGO_CFLAGS="-I/usr/local/include -I/opt/homebrew/include" CGO_LDFLAGS="-L/usr/local/lib -L/opt/homebrew/lib" go build - name: Install Fyne tool run: go install fyne.io/fyne/v2/cmd/fyne@latest