diff --git a/.github/workflows/build_test_release.yml b/.github/workflows/build_test_release.yml index fed5397..c19a10c 100644 --- a/.github/workflows/build_test_release.yml +++ b/.github/workflows/build_test_release.yml @@ -40,18 +40,17 @@ jobs: run: | cp ./src/author.txt ./dist - tag=$(git describe --tags --abbrev=0) #linux build - release_name_linux="cocommit_go-$tag-linux" + release_name_linux="cocommit-linux" tar -C ./dist -czvf "${release_name_linux}.tar.gz" cocommit_go-linux ./author.txt #windows build - release_name_win="cocommit_go-$tag-win" + release_name_win="cocommit-win" tar -C ./dist -czvf "${release_name_win}.tar.gz" cocommit_go-windows ./author.txt #mac build - release_name_mac="cocommit_go-$tag-mac" + release_name_mac="cocommit-darwin-x86_64" tar -C ./dist -czvf "${release_name_mac}.tar.gz" cocommit_go-darwin ./author.txt - name: Release project uses: softprops/action-gh-release@v1 diff --git a/ci/build_test_release.go b/ci/build_test_release.go index f1f10e0..23194aa 100644 --- a/ci/build_test_release.go +++ b/ci/build_test_release.go @@ -44,7 +44,7 @@ func main() { for _, goos := range geese { path := fmt.Sprintf("/dist/") - filename := fmt.Sprintf("/dist/cocommit_go-%s", goos) + filename := fmt.Sprintf("/dist/cocommit-%s", goos) // build application // write the build output to the host build := test. @@ -56,6 +56,17 @@ func main() { } + // extra step to build for aarch on darwin + path := fmt.Sprintf("/dist/") + filename := fmt.Sprintf("/dist/cocommit-darwin-aarch64") + + build := test. + WithEnvVariable("GOOS", "darwin"). + WithEnvVariable("GOARCH", "arm64"). + WithExec([]string{"go", "build", "-o", filename}).WithEnvVariable("CI", "true") + + buildDir = buildDir.WithDirectory(path, build.Directory(path)) + _, err = buildDir.Export(ctx, ".") if err != nil { panic(err)