feat: stop cross compiling miniooni (#908)
See https://github.com/ooni/probe/issues/2119 While there, shrink the Makefile to only export the minimum set of rules to comfortable build using GHA.
This commit is contained in:
+6
-3
@@ -12,6 +12,9 @@ export CGO_ENABLED=1
|
||||
export GOARM=$GOARM
|
||||
export GOOS=$GOOS
|
||||
export GOARCH=$GOARCH
|
||||
go build -o ./CLI/$PRODUCT-$GOOS-$OONIARCH \
|
||||
-ldflags='-s -w -extldflags "-static"' \
|
||||
$GOLANG_EXTRA_FLAGS $PACKAGE
|
||||
for PACKAGE in $@; do
|
||||
PRODUCT=$(basename $PACKAGE)
|
||||
go build -o ./CLI/$PRODUCT-$GOOS-$OONIARCH \
|
||||
-ldflags='-s -w -extldflags "-static"' \
|
||||
$GOLANG_EXTRA_FLAGS $PACKAGE
|
||||
done
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
if [[ $# -ne 2 ]]; then
|
||||
if [[ $# -lt 2 ]]; then
|
||||
echo "" 1>&2
|
||||
echo "Compiler for a Go PACKAGE producing static linux/OONIARCH binaries." 1>&2
|
||||
echo "" 1>&2
|
||||
echo "usage: $0 OONIARCH PACKAGE" 1>&2
|
||||
echo "usage: $0 OONIARCH PACKAGE..." 1>&2
|
||||
echo "" 1>&2
|
||||
echo "OONIARCH must be one of: 386, amd64, arm64, armv6, armv7." 1>&2
|
||||
echo "" 1>&2
|
||||
@@ -26,7 +26,7 @@ fi
|
||||
GOLANG_DOCKER_IMAGE=golang:$(cat GOVERSION)-alpine
|
||||
GOOS=linux
|
||||
OONIARCH=$1
|
||||
PACKAGE=$2
|
||||
shift
|
||||
|
||||
if [[ $OONIARCH == armv7 ]]; then
|
||||
GOARCH=arm
|
||||
@@ -49,14 +49,12 @@ else
|
||||
OONI_PSIPHON_TAGS=""
|
||||
fi
|
||||
|
||||
PRODUCT=$(basename $PACKAGE)
|
||||
|
||||
set -x
|
||||
|
||||
docker pull --platform linux/$DOCKER_ARCH $GOLANG_DOCKER_IMAGE
|
||||
|
||||
docker run --platform linux/$DOCKER_ARCH -e PRODUCT=$PRODUCT \
|
||||
docker run --platform linux/$DOCKER_ARCH \
|
||||
-e GOARM=$GOARM -e GOOS=$GOOS -e GOARCH=$GOARCH \
|
||||
-e PACKAGE=$PACKAGE -e OONI_PSIPHON_TAGS=$OONI_PSIPHON_TAGS \
|
||||
-e OONI_PSIPHON_TAGS=$OONI_PSIPHON_TAGS \
|
||||
-e OONIARCH=$OONIARCH -e GOLANG_EXTRA_FLAGS="${GOLANG_EXTRA_FLAGS:-}" \
|
||||
-v $(pwd):/ooni -w /ooni $GOLANG_DOCKER_IMAGE ./CLI/go-build-alpine
|
||||
-v $(pwd):/ooni -w /ooni $GOLANG_DOCKER_IMAGE ./CLI/go-build-alpine "$@"
|
||||
|
||||
Reference in New Issue
Block a user