From 9509a26d18c8f90b7ebec31da30736558c7dac48 Mon Sep 17 00:00:00 2001 From: "naotama (Naoki KOBAYASHI)" Date: Fri, 8 Sep 2023 12:08:53 +0900 Subject: [PATCH 1/2] build: Build for macOS with ubuntu runner, support 64-bit ARM architecture on Linux and Windows --- .github/workflows/release.yml | 4 +--- .goreleaser.yml | 8 -------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bd41639b..1626fff3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -7,9 +7,7 @@ on: jobs: release: - # Run the build on macOS, because only the macOS version is built with CGO enabled. - # See https://github.com/golang/go/issues/12524 - runs-on: macos-13 + runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 with: diff --git a/.goreleaser.yml b/.goreleaser.yml index 38cd951f..1f234488 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -9,14 +9,6 @@ builds: goos: - linux - windows - goarch: - - amd64 - ldflags: - - "-s -w -X \"github.com/cybozu/assam/cmd.version={{.Version}}\" -X \"github.com/cybozu/assam/cmd.commit={{.ShortCommit}}\" -X \"github.com/cybozu/assam/cmd.date={{.Date}}\"" -- id: assam-darwin - env: - - CGO_ENABLED=1 - goos: - darwin goarch: - amd64 From 2722ec4006d056b980216524c31a2bddc05ea7f5 Mon Sep 17 00:00:00 2001 From: "naotama (Naoki KOBAYASHI)" Date: Fri, 29 Sep 2023 17:18:27 +0900 Subject: [PATCH 2/2] Package execution on CI is also changed to be performed by ubuntu runner --- .github/workflows/ci.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 74e2f300..19b82613 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -47,9 +47,7 @@ jobs: run: npx --package renovate renovate-config-validator package: needs: [static-analysis, go-mod-tidy, test] - # Run the build on macOS, because only the macOS version is built with CGO enabled. - # See https://github.com/golang/go/issues/12524 - runs-on: macos-13 + runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - uses: ./.github/actions/setup-go