refactor(.github/workflows): linux: use ./make, run less frequently (#334)
While there, flush `print`s in `./make` to have more understandable logging. Also part of https://github.com/ooni/probe/issues/1466
This commit is contained in:
parent
b5ba1e743f
commit
6b88730cc4
38
.github/workflows/linux.yml
vendored
38
.github/workflows/linux.yml
vendored
|
@ -1,24 +1,32 @@
|
||||||
# Build and test Linux binary
|
# linux builds ooniprobe for Linux
|
||||||
name: linux
|
name: linux
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
schedule:
|
branches:
|
||||||
- cron: "14 17 * * 3"
|
- "release/**"
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
|
||||||
runs-on: "ubuntu-latest"
|
build_amd64:
|
||||||
|
runs-on: "ubuntu-20.04"
|
||||||
steps:
|
steps:
|
||||||
- name: Docker
|
- run: |
|
||||||
run: |
|
|
||||||
echo $'{\n "experimental": true\n}' | sudo tee /etc/docker/daemon.json
|
echo $'{\n "experimental": true\n}' | sudo tee /etc/docker/daemon.json
|
||||||
sudo service docker restart
|
sudo service docker restart
|
||||||
- uses: actions/setup-go@v1
|
|
||||||
with:
|
|
||||||
go-version: "1.16"
|
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
- run: DOCKER_CLI_EXPERIMENTAL=enabled ./build.sh linux
|
- run: ./make --disable-embedding-psiphon-config -t ./CLI/linux/amd64/ooniprobe
|
||||||
|
env:
|
||||||
|
DOCKER_CLI_EXPERIMENTAL: enabled
|
||||||
- run: ./smoketest.sh ./CLI/linux/amd64/ooniprobe
|
- run: ./smoketest.sh ./CLI/linux/amd64/ooniprobe
|
||||||
- uses: actions/upload-artifact@v1
|
|
||||||
with:
|
build_arm64:
|
||||||
name: ooniprobe-linux-amd64
|
runs-on: "ubuntu-20.04"
|
||||||
path: ./CLI/linux/amd64/ooniprobe
|
steps:
|
||||||
|
- run: |
|
||||||
|
echo $'{\n "experimental": true\n}' | sudo tee /etc/docker/daemon.json
|
||||||
|
sudo service docker restart
|
||||||
|
- uses: actions/checkout@v2
|
||||||
|
- run: sudo apt-get install qemu-user-static
|
||||||
|
- run: ./make --disable-embedding-psiphon-config -t ./CLI/linux/arm64/ooniprobe
|
||||||
|
env:
|
||||||
|
DOCKER_CLI_EXPERIMENTAL: enabled
|
||||||
|
- run: ./smoketest.sh ./CLI/linux/arm64/ooniprobe
|
||||||
|
|
5
make
5
make
|
@ -121,8 +121,8 @@ def sdkmanager_install_cmd(binpath: str) -> List[str]:
|
||||||
|
|
||||||
|
|
||||||
def log(msg: str) -> None:
|
def log(msg: str) -> None:
|
||||||
"""log prints a message on the standard error."""
|
"""log prints a message on the standard output."""
|
||||||
print(msg, file=sys.stderr)
|
print(msg, flush=True)
|
||||||
|
|
||||||
|
|
||||||
class Options(Protocol):
|
class Options(Protocol):
|
||||||
|
@ -1151,7 +1151,6 @@ class OONIProbeLinux:
|
||||||
"linux/{}".format(self._arch),
|
"linux/{}".format(self._arch),
|
||||||
"-e",
|
"-e",
|
||||||
"GOARCH={}".format(self._arch),
|
"GOARCH={}".format(self._arch),
|
||||||
"-it",
|
|
||||||
"-v",
|
"-v",
|
||||||
"{}:/ooni".format(os.getcwd()),
|
"{}:/ooni".format(os.getcwd()),
|
||||||
"-w",
|
"-w",
|
||||||
|
|
Loading…
Reference in New Issue
Block a user