From 9a3eaf6396676796249ca5dd9687e4ff41fa0efb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gianguido=20Sor=C3=A0?= Date: Wed, 21 Feb 2024 12:18:39 +0100 Subject: [PATCH] try different action for osxcross --- .github/workflows/goreleaser.yml | 9 +++++---- .goreleaser.yaml | 12 ++++++------ 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.github/workflows/goreleaser.yml b/.github/workflows/goreleaser.yml index ff8c36df0..b9b5933a1 100644 --- a/.github/workflows/goreleaser.yml +++ b/.github/workflows/goreleaser.yml @@ -23,10 +23,11 @@ jobs: - name: Set up aarch64 gcc run: | sudo apt install gcc make gcc-aarch64-linux-gnu binutils-aarch64-linux-gnu - - name: OSXCross for CGO Support - run: | - mkdir ../../osxcross - git clone https://github.com/plentico/osxcross-target.git ../../osxcross/target + + - name: osxcross + uses: Timmmm/setup-osxcross@main + with: + osx-version: "14.2" - name: Run GoReleaser uses: goreleaser/goreleaser-action@v5 diff --git a/.goreleaser.yaml b/.goreleaser.yaml index b2b0a17d5..40a417d40 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -35,21 +35,21 @@ upx: # - GOSUMDB=sum.golang.org builds: - - id: macos_m1 + - id: macos_intel env: - CGO_ENABLED=1 - - CC=/home/runner/work/osxcross/target/bin/o64-clang - - CXX=/home/runner/work/osxcross/target/bin/o64-clang++ + - CC=o64-clang + - CXX=o64-clang++ goos: - darwin goarch: - amd64 - - id: macos_intel + - id: macos_m1 env: - CGO_ENABLED=1 - - CC=/home/runner/work/osxcross/target/bin/oa64-clang - - CXX=/home/runner/work/osxcross/target/bin/oa64-clang++ + - CC=oa64-clang + - CXX=oa64-clang++ goos: - darwin goarch: