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.

Sign up for GitHub

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

Jump to bottom

Updates to Python 3.7 on Buster for package building for securedrop-client #89

Merged
merged 1 commit into from
Nov 21, 2019
Merged

Updates to Python 3.7 on Buster for package building for securedrop-client #89

merged 1 commit into from
Nov 21, 2019

Conversation

kushaldas
Copy link
Contributor

@kushaldas kushaldas commented Nov 12, 2019 •
edited by redshiftzero
Loading

Resolves #88

To test the same, you will have to build the package in a Debian Buster VM or container.
For the CI, I have also updated the per PR build job to build nightly client, as the last release of the securedrop-client (0.0.9) can not be built on Buster (due to wheel dependency).

I am going to update the CI for securedrop-client in the next PR.

@kushaldas kushaldas force-pushed the buster_build_for_client branch 2 times, most recently from 5e1d551 to 5352cb0 Compare November 12, 2019 14:08
@kushaldas kushaldas mentioned this pull request Nov 12, 2019
Merged
redshiftzero
redshiftzero reviewed Nov 13, 2019
View reviewed changes
.circleci/config.yml
steps:
- checkout
- *installdeps
- *fetchwheels
- *clonesecuredropclient
- *getlatestreleasedversion
- *getnightlyversion
Copy link
Contributor

@redshiftzero redshiftzero Nov 13, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

for background. we're building the latest release to make sure that we can build the current released version of each project with whatever logic is in this repo. can you expand on the motivation for this change?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ahh you said this in the PR description. how about we tag a new version of the client?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

heyyo, I prepared this over in freedomofpress/securedrop-client#625

redshiftzero
redshiftzero suggested changes Nov 13, 2019
View reviewed changes
Copy link
Contributor

@redshiftzero redshiftzero left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

let's add a buster build job, since we're going to be building on both stretch and buster until everyone is migrated over to buster (otherwise devs will stop getting nightlies), see e.g. 65cc0a7

redshiftzero
redshiftzero reviewed Nov 13, 2019
View reviewed changes
securedrop-client/debian/rules
@@ -4,7 +4,7 @@
dh $@ --with python-virtualenv

override_dh_virtualenv:
dh_virtualenv --python /usr/bin/python3.5 --setuptools -S --index-url https://dev-bin.ops.securedrop.org/simple --requirements build-requirements.txt
dh_virtualenv --python /usr/bin/python3.7 --setuptools -S --index-url https://dev-bin.ops.securedrop.org/simple --requirements build-requirements.txt
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this will break stretch builds, so let's make this python3, also there's another hardcoded python3.5 in securedrop-client.triggers so we'll need to update there too

@redshiftzero redshiftzero changed the title Updates to Python 3.7 on Buster for package building Updates to Python 3.7 on Buster for package building for securedrop-client Nov 13, 2019
@redshiftzero
Copy link
Contributor

I am going to update the CI for securedrop-client in the next PR.

?

@kushaldas
Copy link
Contributor Author

I am going to update the CI for securedrop-client in the next PR.

?

freedomofpress/securedrop-client#616 is that PR.

@redshiftzero redshiftzero mentioned this pull request Nov 18, 2019
Merged
3 tasks
@redshiftzero redshiftzero force-pushed the buster_build_for_client branch 2 times, most recently from c363fb5 to db287dd Compare November 18, 2019 20:45
@redshiftzero
Copy link
Contributor

redshiftzero commented Nov 18, 2019 •
edited
Loading

I made these changes in a branch (only because I wanted to lazily test the build in freedomofpress/securedrop-client#625 on both platforms), next steps here are:

  1. Wait for securedrop-client 0.0.10 securedrop-client#625 to be merged and the 0.0.10 tag to be pushed (marking this PR blocked until that is done)
  2. Then we can switch back the getnightlyversion step for getlatestreleasedversion in the build jobs running on each PR and then this PR is good to go and we can move onto updating the other projects

@redshiftzero redshiftzero force-pushed the buster_build_for_client branch from 41943cc to acbad97 Compare November 20, 2019 14:41
redshiftzero
redshiftzero approved these changes Nov 20, 2019
View reviewed changes
Copy link
Contributor

@redshiftzero redshiftzero left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK I think this is good to go, @kushaldas I'll let you review the changes I added here, but approving from my side

redshiftzero
redshiftzero suggested changes Nov 20, 2019
View reviewed changes
Copy link
Contributor

@redshiftzero redshiftzero left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wait just kidding, we need to add the +stretch or +buster to the version strings

@redshiftzero
Copy link
Contributor

this branch in the LFS repo has debs I built and tested on stretch and buster respectively (pointing to them in case anyone wants to test). Once we add +stretch and +buster so that the versions aren't the same, we'll rebuild.

@redshiftzero redshiftzero self-assigned this Nov 20, 2019
@redshiftzero redshiftzero force-pushed the buster_build_for_client branch from c2ffac4 to d8aaaea Compare November 20, 2019 16:06
@eloquence
Copy link
Member

Will this PR resolve #88?

@redshiftzero
Copy link
Contributor

yep it will resolve #88

@kushaldas
Copy link
Contributor Author

I will review the changes.

@redshiftzero redshiftzero mentioned this pull request Nov 20, 2019
Merged
@redshiftzero
Copy link
Contributor

Yep this is ready for review now, the corresponding packages built using this logic are in freedomofpress/securedrop-apt-test#24

redshiftzero
redshiftzero approved these changes Nov 20, 2019
View reviewed changes
Copy link
Contributor

@redshiftzero redshiftzero left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

approving on the latest so that I'm not blocking merge

@redshiftzero redshiftzero removed their assignment Nov 20, 2019
This was referenced Nov 20, 2019
Closed
Closed
@kushaldas
Updates to Python 3.7 on Buster for package building
886914e 
Released version of client can not be build as it is only
for Debian 9.0. We can bring back stable release builds after
next release of client.
@kushaldas kushaldas force-pushed the buster_build_for_client branch from d8aaaea to 886914e Compare November 21, 2019 10:06
kushaldas
kushaldas commented Nov 21, 2019
View reviewed changes
Copy link
Contributor Author

@kushaldas kushaldas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did a rebase and everything worked as they should.

@kushaldas kushaldas merged commit 589f190 into master Nov 21, 2019
@kushaldas kushaldas mentioned this pull request Nov 21, 2019
Merged
@redshiftzero redshiftzero deleted the buster_build_for_client branch November 21, 2019 13:38
@redshiftzero redshiftzero mentioned this pull request Nov 21, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@redshiftzero redshiftzero redshiftzero approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Update package build logic to support securedrop-client builds on Buster
3 participants
@kushaldas @redshiftzero @eloquence