fix: repair releasing miniooni and ooniprobe-windows (#900)

It seems several CI builds failed for [v3.16.0-alpha](https://github.com/ooni/probe-cli/releases/tag/v3.16.0-alpha). Let's aim to repair miniooni and ooniprobe-windows for now. The other failing builds seem more tricky. (Android fails with an unsupported NDK while Linux fails with issues accessing the git repository from Docker, probably because the  the user running inside Docker is not the user that owns the repository.)
This commit is contained in:
Simone Basso 2022-08-29 00:48:46 +02:00 committed by GitHub
parent 90089d4d8f
commit 37632f60d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 34 additions and 3 deletions

View File

@ -41,6 +41,16 @@ jobs:
- run: make ./CLI/miniooni - run: make ./CLI/miniooni
- run: ./E2E/miniooni.bash ./CLI/miniooni-linux-amd64 - run: ./E2E/miniooni.bash ./CLI/miniooni-linux-amd64
- uses: actions/upload-artifact@v1
with:
name: miniooni-darwin-amd64
path: ./CLI/miniooni-darwin-amd64
- uses: actions/upload-artifact@v1
with:
name: miniooni-darwin-arm64
path: ./CLI/miniooni-darwin-arm64
- uses: actions/upload-artifact@v1 - uses: actions/upload-artifact@v1
with: with:
name: miniooni-linux-386 name: miniooni-linux-386
@ -51,6 +61,11 @@ jobs:
name: miniooni-linux-amd64 name: miniooni-linux-amd64
path: ./CLI/miniooni-linux-amd64 path: ./CLI/miniooni-linux-amd64
- uses: actions/upload-artifact@v1
with:
name: miniooni-linux-armv6
path: ./CLI/miniooni-linux-armv6
- uses: actions/upload-artifact@v1 - uses: actions/upload-artifact@v1
with: with:
name: miniooni-linux-armv7 name: miniooni-linux-armv7
@ -61,6 +76,16 @@ jobs:
name: miniooni-linux-arm64 name: miniooni-linux-arm64
path: ./CLI/miniooni-linux-arm64 path: ./CLI/miniooni-linux-arm64
- uses: actions/upload-artifact@v1
with:
name: miniooni-windows-386.exe
path: ./CLI/miniooni-windows-386.exe
- uses: actions/upload-artifact@v1
with:
name: miniooni-windows-amd64.exe
path: ./CLI/miniooni-windows-amd64.exe
- run: | - run: |
tag=$(echo $GITHUB_REF | sed 's|refs/tags/||g') tag=$(echo $GITHUB_REF | sed 's|refs/tags/||g')
gh release create -p $tag --target $GITHUB_SHA || true gh release create -p $tag --target $GITHUB_SHA || true
@ -68,6 +93,7 @@ jobs:
./CLI/miniooni-darwin-arm64 \ ./CLI/miniooni-darwin-arm64 \
./CLI/miniooni-linux-386 \ ./CLI/miniooni-linux-386 \
./CLI/miniooni-linux-amd64 \ ./CLI/miniooni-linux-amd64 \
./CLI/miniooni-linux-armv6 \
./CLI/miniooni-linux-armv7 \ ./CLI/miniooni-linux-armv7 \
./CLI/miniooni-linux-arm64 \ ./CLI/miniooni-linux-arm64 \
./CLI/miniooni-windows-386.exe \ ./CLI/miniooni-windows-386.exe \

View File

@ -2,7 +2,7 @@
set -euo pipefail set -euo pipefail
EXPECTED_MINGW_W64_VERSION=${EXPECTED_MINGW_W64_VERSION:-12.1.0} # Allow overriding EXPECTED_MINGW_W64_VERSION=${EXPECTED_MINGW_W64_VERSION:-12.2.0} # Allow overriding
printf "checking for x86_64-w64-mingw32-gcc... " printf "checking for x86_64-w64-mingw32-gcc... "
command -v x86_64-w64-mingw32-gcc || { command -v x86_64-w64-mingw32-gcc || {

View File

@ -47,6 +47,11 @@ else
OONI_PSIPHON_TAGS="" OONI_PSIPHON_TAGS=""
fi fi
EXT=
if [[ $GOOS == "windows" ]]; then
EXT=.exe
fi
PRODUCT=$(basename $PACKAGE) PRODUCT=$(basename $PACKAGE)
set -x set -x
@ -55,5 +60,5 @@ export GOOS=$GOOS
export GOARCH=$GOARCH export GOARCH=$GOARCH
export GOARM=$GOARM export GOARM=$GOARM
go build -tags=$OONI_PSIPHON_TAGS -ldflags="-s -w" \ go build -tags=$OONI_PSIPHON_TAGS -ldflags="-s -w" \
-o ./CLI/$PRODUCT-$GOOS-$OONIARCH ${GOLANG_EXTRA_FLAGS:-} \ -o ./CLI/$PRODUCT-$GOOS-$OONIARCH$EXT ${GOLANG_EXTRA_FLAGS:-} \
$PACKAGE $PACKAGE

View File

@ -51,5 +51,5 @@ export CGO_ENABLED=1
export GOOS=$GOOS export GOOS=$GOOS
export GOARCH=$GOARCH export GOARCH=$GOARCH
go build -tags=$OONI_PSIPHON_TAGS -ldflags="-s -w" \ go build -tags=$OONI_PSIPHON_TAGS -ldflags="-s -w" \
-o ./CLI/$PRODUCT-$GOOS-$GOARCH ${GOLANG_EXTRA_FLAGS:-} \ -o ./CLI/$PRODUCT-$GOOS-$GOARCH.exe ${GOLANG_EXTRA_FLAGS:-} \
$PACKAGE $PACKAGE