Skip to content

Commit

Permalink
Merge pull request #263 from cybozu/change-macos-build-runner
Browse files Browse the repository at this point in the history
Build for macOS with ubuntu runner, support 64-bit ARM architecture on Windows and Linux
  • Loading branch information
naotama2002 committed Oct 10, 2023
2 parents b3e2fcf + 2722ec4 commit 6c335e5
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 14 deletions.
4 changes: 1 addition & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
8 changes: 0 additions & 8 deletions .goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 6c335e5

Please sign in to comment.