c/ooni-probe-cli
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: publish miniooni binaries into releases (#607)

Browse Source 
This is the miniooni related part of https://github.com/ooni/probe/issues/1879.

This diff will require backport to the release/3.11 branch.
This commit is contained in:
Simone Basso 2021-11-22 13:40:36 +01:00 committed by GitHub
parent 264e30f016
commit 7f0fb5e619
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 64 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
.github/workflows/miniooni.yml vendored
View File

@ -1,19 +1,26 @@
# miniooni checks whether we can build the research client miniooni # miniooni checks whether we can build the research client miniooni
# and publishes the linux binaries as artefacts. There is no point in # and publishes the linux binaries as artifacts and, if we're building
# publishing windows or darwin binaries b/c they are not signed. # a tag, into the current release. We don't publish artifacts for
# Windows and macOS because they're not signed. For releases, we have
# a script that we'll later use to sign unsigned binaries.
name: miniooni name: miniooni
on: on:
push: push:
branches: branches:
- "master" - "master"
- "release/**" - "release/**"
tags:
- "v*"
jobs: jobs:
test: build_and_publish:
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
steps: steps:
- uses: actions/setup-go@v1 - uses: actions/setup-go@v1
with: with:
go-version: "1.17.3" go-version: "1.17.3"
- uses: actions/checkout@v2 - uses: actions/checkout@v2
with: with:
fetch-depth: 0 fetch-depth: 0
@ -26,25 +33,36 @@ jobs:
PSIPHON_CONFIG_JSON_AGE_BASE64: ${{ secrets.PSIPHON_CONFIG_JSON_AGE_BASE64 }} PSIPHON_CONFIG_JSON_AGE_BASE64: ${{ secrets.PSIPHON_CONFIG_JSON_AGE_BASE64 }}
- run: ./mk ./CLI/miniooni - run: ./mk ./CLI/miniooni
- run: ./E2E/miniooni.bash ./CLI/miniooni-linux-amd64
- run: ./E2E/miniooni.bash ./CLI/linux/amd64/miniooni
- uses: actions/upload-artifact@v1 - uses: actions/upload-artifact@v1
with: with:
name: miniooni-linux-386 name: miniooni-linux-386
path: ./CLI/linux/386/miniooni path: ./CLI/miniooni-linux-386
- uses: actions/upload-artifact@v1 - uses: actions/upload-artifact@v1
with: with:
name: miniooni-linux-amd64 name: miniooni-linux-amd64
path: ./CLI/linux/amd64/miniooni path: ./CLI/miniooni-linux-amd64
- uses: actions/upload-artifact@v1 - uses: actions/upload-artifact@v1
with: with:
name: miniooni-linux-arm name: miniooni-linux-armv7
path: ./CLI/linux/arm/miniooni path: ./CLI/miniooni-linux-armv7
- uses: actions/upload-artifact@v1 - uses: actions/upload-artifact@v1
with: with:
name: miniooni-linux-arm64 name: miniooni-linux-arm64
path: ./CLI/linux/arm64/miniooni path: ./CLI/miniooni-linux-arm64
- run: |
tag=$(echo $GITHUB_REF | sed 's|refs/tags/||g')
gh release create -p $tag --target $GITHUB_SHA || true
gh release upload $tag --clobber ./CLI/miniooni-darwin-amd64 \
./CLI/miniooni-darwin-arm64 \
./CLI/miniooni-linux-386 \
./CLI/miniooni-linux-amd64 \
./CLI/miniooni-linux-armv7 \
./CLI/miniooni-linux-arm64 \
./CLI/miniooni-windows-386.exe \
./CLI/miniooni-windows-amd64.exe
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

1
CLI/.gitignore vendored Normal file
View File

@ -0,0 +1 @@
/miniooni-*

64
mk
View File

@ -161,68 +161,68 @@ GOLANG_DOCKER_IMAGE = golang:$(GOLANG_VERSION_NUMBER)-alpine
#help: You can also build the following subtargets: #help: You can also build the following subtargets:
.PHONY: ./CLI/miniooni .PHONY: ./CLI/miniooni
./CLI/miniooni: \ ./CLI/miniooni: \
./CLI/darwin/amd64/miniooni \ ./CLI/miniooni-darwin-amd64 \
./CLI/darwin/arm64/miniooni \ ./CLI/miniooni-darwin-arm64 \
./CLI/linux/386/miniooni \ ./CLI/miniooni-linux-386 \
./CLI/linux/amd64/miniooni \ ./CLI/miniooni-linux-amd64 \
./CLI/linux/arm/miniooni \ ./CLI/miniooni-linux-armv7 \
./CLI/linux/arm64/miniooni \ ./CLI/miniooni-linux-arm64 \
./CLI/windows/386/miniooni.exe \ ./CLI/miniooni-windows-386.exe \
./CLI/windows/amd64/miniooni.exe ./CLI/miniooni-windows-amd64.exe
# All the miniooni targets build with CGO_ENABLED=0 such that the build # All the miniooni targets build with CGO_ENABLED=0 such that the build
# succeeds when the GOOS/GOARCH is such that we aren't crosscompiling # succeeds when the GOOS/GOARCH is such that we aren't crosscompiling
# (e.g., targeting darwin/amd64 on darwin/amd64) _and_ there's no C compiler # (e.g., targeting darwin/amd64 on darwin/amd64) _and_ there's no C compiler
# installed on the system. We can afford that since miniooni is pure Go. # installed on the system. We can afford that since miniooni is pure Go.
#help: #help:
#help: * `./mk ./CLI/darwin/amd64/miniooni`: darwin/amd64 #help: * `./mk ./CLI/miniooni-darwin-amd64`: darwin/amd64
.PHONY: ./CLI/darwin/amd64/miniooni .PHONY: ./CLI/miniooni-darwin-amd64
./CLI/darwin/amd64/miniooni: search/for/go maybe/copypsiphon ./CLI/miniooni-darwin-amd64: search/for/go maybe/copypsiphon
GOOS=darwin GOARCH=amd64 CGO_ENABLED=0 go build -tags="$(OONI_PSIPHON_TAGS)" -ldflags="-s -w" $(GOLANG_EXTRA_FLAGS) -o $@ ./internal/cmd/miniooni GOOS=darwin GOARCH=amd64 CGO_ENABLED=0 go build -tags="$(OONI_PSIPHON_TAGS)" -ldflags="-s -w" $(GOLANG_EXTRA_FLAGS) -o $@ ./internal/cmd/miniooni
#help: #help:
#help: * `./mk ./CLI/darwin/arm64/miniooni`: darwin/arm64 #help: * `./mk ./CLI/miniooni-darwin-arm64`: darwin/arm64
.PHONY: ./CLI/darwin/arm64/miniooni .PHONY: ./CLI/miniooni-darwin-arm64
./CLI/darwin/arm64/miniooni: search/for/go maybe/copypsiphon ./CLI/miniooni-darwin-arm64: search/for/go maybe/copypsiphon
GOOS=darwin GOARCH=arm64 CGO_ENABLED=0 go build -tags="$(OONI_PSIPHON_TAGS)" -ldflags="-s -w" $(GOLANG_EXTRA_FLAGS) -o $@ ./internal/cmd/miniooni GOOS=darwin GOARCH=arm64 CGO_ENABLED=0 go build -tags="$(OONI_PSIPHON_TAGS)" -ldflags="-s -w" $(GOLANG_EXTRA_FLAGS) -o $@ ./internal/cmd/miniooni
# When building for Linux we use `-tags netgo` and `-extldflags -static` to produce # When building for Linux we use `-tags netgo` and `-extldflags -static` to produce
# a statically linked binary that completely bypasses libc. # a statically linked binary that completely bypasses libc.
#help: #help:
#help: * `./mk ./CLI/linux/386/miniooni`: linux/386 #help: * `./mk ./CLI/miniooni-linux-386`: linux/386
.PHONY: ./CLI/linux/386/miniooni .PHONY: ./CLI/miniooni-linux-386
./CLI/linux/386/miniooni: search/for/go maybe/copypsiphon ./CLI/miniooni-linux-386: search/for/go maybe/copypsiphon
GOOS=linux GOARCH=386 CGO_ENABLED=0 go build -tags="netgo,$(OONI_PSIPHON_TAGS)" -ldflags="-s -w -extldflags -static" $(GOLANG_EXTRA_FLAGS) -o $@ ./internal/cmd/miniooni GOOS=linux GOARCH=386 CGO_ENABLED=0 go build -tags="netgo,$(OONI_PSIPHON_TAGS)" -ldflags="-s -w -extldflags -static" $(GOLANG_EXTRA_FLAGS) -o $@ ./internal/cmd/miniooni
#help: #help:
#help: * `./mk ./CLI/linux/amd64/miniooni`: linux/amd64 #help: * `./mk ./CLI/miniooni-linux-amd64`: linux/amd64
.PHONY: ./CLI/linux/amd64/miniooni .PHONY: ./CLI/miniooni-linux-amd64
./CLI/linux/amd64/miniooni: search/for/go maybe/copypsiphon ./CLI/miniooni-linux-amd64: search/for/go maybe/copypsiphon
GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -tags="netgo,$(OONI_PSIPHON_TAGS)" -ldflags="-s -w -extldflags -static" $(GOLANG_EXTRA_FLAGS) -o $@ ./internal/cmd/miniooni GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -tags="netgo,$(OONI_PSIPHON_TAGS)" -ldflags="-s -w -extldflags -static" $(GOLANG_EXTRA_FLAGS) -o $@ ./internal/cmd/miniooni
# When building for GOARCH=arm, we always force GOARM=7 (i.e., armhf/armv7). # When building for GOARCH=arm, we always force GOARM=7 (i.e., armhf/armv7).
#help: #help:
#help: * `./mk ./CLI/linux/arm/miniooni`: linux/arm #help: * `./mk ./CLI/miniooni-linux-armv7`: linux/armv7
.PHONY: ./CLI/linux/arm/miniooni .PHONY: ./CLI/miniooni-linux-armv7
./CLI/linux/arm/miniooni: search/for/go maybe/copypsiphon ./CLI/miniooni-linux-armv7: search/for/go maybe/copypsiphon
GOOS=linux GOARCH=arm CGO_ENABLED=0 GOARM=7 go build -tags="netgo,$(OONI_PSIPHON_TAGS)" -ldflags="-s -w -extldflags -static" $(GOLANG_EXTRA_FLAGS) -o $@ ./internal/cmd/miniooni GOOS=linux GOARCH=arm CGO_ENABLED=0 GOARM=7 go build -tags="netgo,$(OONI_PSIPHON_TAGS)" -ldflags="-s -w -extldflags -static" $(GOLANG_EXTRA_FLAGS) -o $@ ./internal/cmd/miniooni
#help: #help:
#help: * `./mk ./CLI/linux/arm64/miniooni`: linux/arm64 #help: * `./mk ./CLI/miniooni-linux-arm64`: linux/arm64
.PHONY: ./CLI/linux/arm64/miniooni .PHONY: ./CLI/miniooni-linux-arm64
./CLI/linux/arm64/miniooni: search/for/go maybe/copypsiphon ./CLI/miniooni-linux-arm64: search/for/go maybe/copypsiphon
GOOS=linux GOARCH=arm64 CGO_ENABLED=0 go build -tags="netgo,$(OONI_PSIPHON_TAGS)" -ldflags="-s -w -extldflags -static" $(GOLANG_EXTRA_FLAGS) -o $@ ./internal/cmd/miniooni GOOS=linux GOARCH=arm64 CGO_ENABLED=0 go build -tags="netgo,$(OONI_PSIPHON_TAGS)" -ldflags="-s -w -extldflags -static" $(GOLANG_EXTRA_FLAGS) -o $@ ./internal/cmd/miniooni
#help: #help:
#help: * `./mk ./CLI/windows/386/miniooni.exe`: windows/386 #help: * `./mk ./CLI/miniooni-windows-386.exe`: windows/386
.PHONY: ./CLI/windows/386/miniooni.exe .PHONY: ./CLI/miniooni-windows-386.exe
./CLI/windows/386/miniooni.exe: search/for/go maybe/copypsiphon ./CLI/miniooni-windows-386.exe: search/for/go maybe/copypsiphon
GOOS=windows GOARCH=386 CGO_ENABLED=0 go build -tags="$(OONI_PSIPHON_TAGS)" -ldflags="-s -w" $(GOLANG_EXTRA_FLAGS) -o $@ ./internal/cmd/miniooni GOOS=windows GOARCH=386 CGO_ENABLED=0 go build -tags="$(OONI_PSIPHON_TAGS)" -ldflags="-s -w" $(GOLANG_EXTRA_FLAGS) -o $@ ./internal/cmd/miniooni
#help: #help:
#help: * `./mk ./CLI/windows/amd64/miniooni.exe`: windows/amd64 #help: * `./mk ./CLI/miniooni-windows-amd64.exe`: windows/amd64
.PHONY: ./CLI/windows/amd64/miniooni.exe .PHONY: ./CLI/miniooni-windows-amd64.exe
./CLI/windows/amd64/miniooni.exe: search/for/go maybe/copypsiphon ./CLI/miniooni-windows-amd64.exe: search/for/go maybe/copypsiphon
GOOS=windows GOARCH=amd64 CGO_ENABLED=0 go build -tags="$(OONI_PSIPHON_TAGS)" -ldflags="-s -w" $(GOLANG_EXTRA_FLAGS) -o $@ ./internal/cmd/miniooni GOOS=windows GOARCH=amd64 CGO_ENABLED=0 go build -tags="$(OONI_PSIPHON_TAGS)" -ldflags="-s -w" $(GOLANG_EXTRA_FLAGS) -o $@ ./internal/cmd/miniooni
#help: #help: