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

Builds nightly debs for sd-svs-disp package #131

Merged
merged 3 commits into from Jan 23, 2020

Conversation

conorsch
Copy link
Contributor

@conorsch conorsch commented Jan 23, 2020

We were already building the package on PR runs, but not as nightlies.
Adds a nightly job to changes propagate to the dev lfs repo.
Identified in freedomofpress/securedrop-workstation#282 (comment)

@conorsch
Copy link
Contributor Author

N.B. conflicts with #130

@@ -276,6 +276,8 @@ jobs:
- *setsvsdispname
- *setmetapackageversion
- *builddebianpackage
- *addsshkeys
- *commitworkstationdebs
Copy link
Contributor

Choose a reason for hiding this comment

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

heads up this job runs per-PR

per package generally we have two CI jobs, one running per-PR that builds the latest released version (see: build-buster-securedrop-export), and one running nightly (see: build-nightly-buster-securedrop-export) that bumps the version and after build commits the package

for this change we should add a new nightly job and leave this build-buster-securedrop-workstation-svs-disp as is

Copy link
Contributor Author

Choose a reason for hiding this comment

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

addressed, good call

@conorsch conorsch force-pushed the build-nightly-packages-for-sd-svs-disp branch from f8c8815 to 62e3358 Compare January 23, 2020 02:03
@conorsch conorsch changed the title Commits nightly debs for sd-svs-disp package Builds nightly debs for sd-svs-disp package Jan 23, 2020
@conorsch conorsch force-pushed the build-nightly-packages-for-sd-svs-disp branch from 62e3358 to 18f89ea Compare January 23, 2020 02:05
@conorsch
Copy link
Contributor Author

New build is already live via freedomofpress/securedrop-apt-test@43dd60f, due to a mistake in an earlier version of this PR (see comment by @redshiftzero). Ready for review.

- checkout
- *installdeps
- *setsvsdispname
- *setmetapackageversion
Copy link
Contributor

Choose a reason for hiding this comment

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

does this bump the version? i think with this it will just keep committing versions of the same package

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Agreed. At a glance, we don't have sufficient logic to increment here, we'll need to write something new. Neither &getlatestreleasedversion nor &getnightlyversion are what we want, because both assume the package has a tag that matches its version, which isn't true since this package is managed inside this repo.

@@ -320,3 +332,4 @@ workflows:
- build-nightly-buster-securedrop-log:
requires:
- build-nightly-buster-securedrop-export
- build-nightly-buster-securedrop-workstation-svs-disp
Copy link
Contributor

Choose a reason for hiding this comment

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

let's have this require build-nightly-buster-securedrop-log (this is so the jobs don't race each other, see comment above the nightly key)

this will conflict with #129 but we can rebase whichever gets merged last

@conorsch conorsch added the help wanted Extra attention is needed label Jan 23, 2020
@emkll emkll removed the help wanted Extra attention is needed label Jan 23, 2020
@emkll
Copy link
Contributor

emkll commented Jan 23, 2020

Appended d6837be to this branch to bump metapackage version and update changelog for sd-svs-disp nightly builds, which should address the outstanding review comment in #131 (comment)

Conor Schaefer and others added 3 commits January 23, 2020 09:18
We were already building the package on PR runs, but not as nightlies.
Adds a nightly job to changes propagate to the dev lfs repo.
Identified in freedomofpress/securedrop-workstation#282 (comment)
Avoid races, don't build in parallel.
@emkll emkll force-pushed the build-nightly-packages-for-sd-svs-disp branch from d6837be to 53f402d Compare January 23, 2020 14:21
@emkll
Copy link
Contributor

emkll commented Jan 23, 2020

Rebased on latest master (due to the merge of #129) see https://circleci.com/gh/freedomofpress/securedrop-debian-packaging/2449 for test results

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.

thanks @conorsch @emkll! lgtm

@redshiftzero redshiftzero merged commit 0c91a2e into master Jan 23, 2020
@redshiftzero redshiftzero deleted the build-nightly-packages-for-sd-svs-disp branch January 23, 2020 14:38
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.

None yet

3 participants