Skip to content

Allow adding multiple suite names to branches #3633

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+4 −4
Open

Allow adding multiple suite names to branches #3633

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions scripts/pop-ci/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,9 +400,9 @@ sudo sbuild-update \

let mut repo_ctx = RepoContext::default();
for (branch, commit) in heads.iter() {
let mut parts = branch.id().splitn(2, '_');
let mut parts = branch.id().split('_');
let pocket = Pocket::new(parts.next().unwrap());
let pattern_opt = parts.next();
let patterns: Vec<_> = parts.collect();

for suite in Suite::ALL.iter() {
match suite.distro() {
Expand All @@ -422,9 +422,9 @@ sudo sbuild-update \
}

let key = (pocket.clone(), suite.clone());
let insert = if let Some(pattern) = pattern_opt {
let insert = if !patterns.is_empty() {
// Insert pattern entry if pattern matches
pattern == suite.id()
patterns.contains(&suite.id())
} else if suite.wildcard(repo_name) {
// Only insert wildcard entry if no others are found, and suite supports it
!repo_ctx.pockets.contains_key(&key)
Expand Down