Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

doc: document branching and releasing #554

Merged
merged 3 commits into from
Oct 22, 2021
Merged

doc: document branching and releasing #554

merged 3 commits into from
Oct 22, 2021

Conversation

bassosimone
Copy link
Contributor

@bassosimone bassosimone commented Oct 22, 2021

Checklist

Description

This diff starts to better specify branching and the release process, thus addressing ooni/probe#1506 (comment).

In ooni/probe#1741, we observed that
every attempt to use `docker --platform` along with `debian` for
packaging ooniprobe fails with `SEGFAULT`, except when using
the `debian:oldstable` container.

To fix this issue, in this diff we fix Debian packaging to run on
any debian system (`debian:stable` in our case) provided that we
have `qemu-user-static` installed on the system and the system is
a Debian (or Debian-derived) system.

The trick here is to use `dpkg-buildpackage -a $deb_arch`. We
also need to disable a few `debian/rules` that we don't actually
need anyway.

Closes ooni/probe#1741.

This cherry-picks 36a5bf3
from the stable branch into the master branch.
@bassosimone bassosimone requested a review from hellais as a code owner October 22, 2021 13:16
@bassosimone bassosimone changed the title Branching doc: document branching and releasing Oct 22, 2021
@bassosimone bassosimone merged commit 197dc37 into master Oct 22, 2021
@bassosimone bassosimone deleted the branching branch October 22, 2021 13:41
bassosimone added a commit that referenced this pull request Oct 22, 2021
This diff starts to better specify branching and the release process,
thus addressing ooni/probe#1506 (comment).

We're cherry-picking this commit from the master branch.

Conflicts:
	.github/workflows/codeql-analysis.yml
	.github/workflows/coverage.yml
ainghazal pushed a commit to ainghazal/probe-cli that referenced this pull request Mar 8, 2022
This diff starts to better specify branching and the release process, thus addressing ooni/probe#1506 (comment).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant