c/ooni-probe-cli
Watch
1
0
Fork
You've already forked ooni-probe-cli
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

CLI, debian, make: misc cleanup and changes (#336)

Browse source 
This PR	groups misc cleanup and changes from https://github.com/ooni/probe-cli/pull/331.

* CLI/linux/build: add documentation

* debian/.gitignore: ignore generated files

* debian/TODO: unnecessary at this point

* debian/ooniprobe-cli.service: remove commented out lines

* debian/rules: remove unnecessary actions

* make: reindent and fix spelling

* smoketest.sh: don't run in verbose mode

Part of https://github.com/ooni/probe/issues/1466
This commit is contained in:
Simone Basso 2021-05-06 21:20:45 +02:00 • committed by GitHub
commit c258a0fedd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 34 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

37
make
View file

@ -440,9 +440,9 @@ class Environ:
def __exit__(self, type: Any, value: Any, traceback: Any) -> bool:
if self._prev is None:
self._engine.unsetenv(self._key)
return False # progagate exc
return False # propagate exc
self._engine.setenv(self._key, self._prev)
return False # progagate exc
return False # propagate exc
class AugmentedPath(Environ):
@ -1281,22 +1281,31 @@ OONIPROBE_TARGETS: List[Target] = [
OONIPROBE_SIGNED_TARGETS: List[Target] = [Sign(x) for x in OONIPROBE_TARGETS]
# OONIPROBE_RELEASE_DARWIN contains the release darwin targets
OONIPROBE_RELEASE_DARWIN = Phony("ooniprobe_release_darwin", [
Sign(OONIProbeDarwin("amd64")),
Sign(OONIProbeDarwin("arm64")),
])
OONIPROBE_RELEASE_DARWIN = Phony(
"ooniprobe_release_darwin",
[
Sign(OONIProbeDarwin("amd64")),
Sign(OONIProbeDarwin("arm64")),
],
)
# OONIPROBE_RELEASE_LINUX contains the release linux targets
OONIPROBE_RELEASE_LINUX = Phony("ooniprobe_release_linux", [
Sign(OONIProbeLinux("amd64")),
Sign(OONIProbeLinux("arm64")),
])
OONIPROBE_RELEASE_LINUX = Phony(
"ooniprobe_release_linux",
[
Sign(OONIProbeLinux("amd64")),
Sign(OONIProbeLinux("arm64")),
],
)
# OONIPROBE_RELEASE_WINDOWS contains the release windows targets
OONIPROBE_RELEASE_WINDOWS = Phony("ooniprobe_release_windows", [
Sign(OONIProbeWindows("amd64")),
Sign(OONIProbeWindows("386")),
])
OONIPROBE_RELEASE_WINDOWS = Phony(
"ooniprobe_release_windows",
[
Sign(OONIProbeWindows("amd64")),
Sign(OONIProbeWindows("386")),
],
)
# MOBILE_TARGETS contains the top-level mobile targets.
MOBILE_TARGETS: List[Target] = [