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

scripts/ci: When building a package, add corresponding staging repo #1197

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

ids1024
Copy link
Member

@ids1024 ids1024 commented Aug 19, 2020

This way a package can build against an unreleased dynamic library (for instance) if both are in branches with the same name.

Some resolution to this is needed for https://github.com/pop-os/gnome-control-center/tree/pop-keyboard_focal to be able build with a dependency on keyboard-backlight. Opening as a draft because I'm not sure this is a good idea...

This way a package can build against an unreleased dynamic library (for
instance) if both are in branches with the same name.
@ids1024 ids1024 force-pushed the sbuild-staging-repos branch from 8824fb2 to b99d810 Compare August 19, 2020 17:35
"--no-apt-distupgrade",
]

for (repo, _) in pockets:
Copy link
Member Author

Choose a reason for hiding this comment

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

My main concern here is what might be in pockets, and the fact that this potentially adds multiple additional repositories. If I understand, if the same commit is pushed to multiple branches, the CI will use the same build. I'm not sure if the dependencies it adds here might then cause possible problems...

Copy link
Member

Choose a reason for hiding this comment

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

All you really need is to add the branch the package is being built from, so if building for focal on branch new-feature, you'd add http://apt.pop-os.org/staging/new-release focal main.

Copy link
Member Author

Choose a reason for hiding this comment

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

My understanding is that in the (unlikely) case that the same commit is pushed to two branches between CI runs, pockets will contain both branches, and the same build will be used for both. If another branch is later updated to a commit that already has a build for another branch (for instance, a fast-forward merge), the package will be copied without rebuilding.

That's why this requires a loop and potentially could add multiple branches. But I'm happy to be corrected.

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.

2 participants