From 1a483c0e4331e26d8b02b7e78ce380e581890f73 Mon Sep 17 00:00:00 2001 From: Marten Seemann Date: Sun, 23 Apr 2023 14:10:48 +0200 Subject: [PATCH 1/2] ci: remove outdated version checks from cross compilation script --- .github/workflows/cross-compile.sh | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/cross-compile.sh b/.github/workflows/cross-compile.sh index 24666bfb..7797d774 100755 --- a/.github/workflows/cross-compile.sh +++ b/.github/workflows/cross-compile.sh @@ -2,17 +2,11 @@ set -e -GOVERSION=$(go version | cut -d " " -f 3 | cut -b 3-6) - for dist in $(go tool dist list); do goos=$(echo $dist | cut -d "/" -f1) goarch=$(echo $dist | cut -d "/" -f2) # cross-compiling for android is a pain... if [[ "$goos" == "android" ]]; then continue; fi - # Go 1.14 lacks syscall.IPV6_RECVTCLASS - if [[ $GOVERSION == "1.14" && $goos == "darwin" && $goarch == "arm" ]]; then continue; fi - # darwin/arm64 requires Cgo for Go < 1.16 - if [[ $GOVERSION != "1.16" && "$goos" == "darwin" && $goarch == "arm64" ]]; then continue; fi # iOS builds require Cgo, see https://github.com/golang/go/issues/43343 # Cgo would then need a C cross compilation setup. Not worth the hassle. if [[ "$goos" == "ios" ]]; then continue; fi From 523036c4e63d1a3a14a691aefc0868d81a75c6e2 Mon Sep 17 00:00:00 2001 From: Marten Seemann Date: Sun, 23 Apr 2023 14:13:12 +0200 Subject: [PATCH 2/2] ci: run go build jobs in parallel in cross compile job --- .github/workflows/cross-compile.sh | 25 +++++++++++++------------ .github/workflows/cross-compile.yml | 3 ++- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/.github/workflows/cross-compile.sh b/.github/workflows/cross-compile.sh index 7797d774..ff5b67fc 100755 --- a/.github/workflows/cross-compile.sh +++ b/.github/workflows/cross-compile.sh @@ -2,16 +2,17 @@ set -e -for dist in $(go tool dist list); do - goos=$(echo $dist | cut -d "/" -f1) - goarch=$(echo $dist | cut -d "/" -f2) - # cross-compiling for android is a pain... - if [[ "$goos" == "android" ]]; then continue; fi - # iOS builds require Cgo, see https://github.com/golang/go/issues/43343 - # Cgo would then need a C cross compilation setup. Not worth the hassle. - if [[ "$goos" == "ios" ]]; then continue; fi +dist="$1" +goos=$(echo "$dist" | cut -d "/" -f1) +goarch=$(echo "$dist" | cut -d "/" -f2) - echo "$dist" - GOOS=$goos GOARCH=$goarch go build -o main example/main.go - rm main -done +# cross-compiling for android is a pain... +if [[ "$goos" == "android" ]]; then exit; fi +# iOS builds require Cgo, see https://github.com/golang/go/issues/43343 +# Cgo would then need a C cross compilation setup. Not worth the hassle. +if [[ "$goos" == "ios" ]]; then exit; fi + +echo "$dist" +out="main-$goos-$goarch" +GOOS=$goos GOARCH=$goarch go build -o $out example/main.go +rm $out diff --git a/.github/workflows/cross-compile.yml b/.github/workflows/cross-compile.yml index 7a8cedf4..e9f9211f 100644 --- a/.github/workflows/cross-compile.yml +++ b/.github/workflows/cross-compile.yml @@ -19,4 +19,5 @@ jobs: - name: Install dependencies run: go build example/main.go - name: Run cross compilation - run: .github/workflows/cross-compile.sh + # run in parallel on as many cores as are available on the machine + run: go tool dist list | xargs -I % -P "$(nproc)" .github/workflows/cross-compile.sh %