From b5bf087bf5303880af01c1e1000a29591da54585 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Thu, 16 Dec 2021 11:56:23 -0700 Subject: [PATCH] Transition to main staging repo --- scripts/pop-ci/src/main.rs | 15 ++++++++++++++- scripts/pop-ci/src/repo.rs | 2 +- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/scripts/pop-ci/src/main.rs b/scripts/pop-ci/src/main.rs index 6dec4a49..00ff44a7 100644 --- a/scripts/pop-ci/src/main.rs +++ b/scripts/pop-ci/src/main.rs @@ -457,6 +457,19 @@ sudo sbuild-update \ } } + // Transition master pockets to main pockets, if main pocket does not exist + { + for suite in Suite::ALL.iter() { + let main_key = (Pocket::new("main"), suite.clone()); + if ! repo_ctx.pockets.contains_key(&main_key) { + let master_key = (Pocket::new("master"), suite.clone()); + if let Some(entry) = repo_ctx.pockets.remove(&master_key) { + repo_ctx.pockets.insert(main_key, entry); + } + } + } + } + for ((pocket, suite), (commit, branch)) in repo_ctx.pockets.iter() { let build = repo_ctx.builds.entry(commit.clone()) .or_insert(RepoBuild::default()); @@ -1058,7 +1071,7 @@ sudo sbuild-update \ pool_rebuilt = true; } - if pocket.id() == "master" && launchpad { + if pocket.id() == "main" && launchpad { for (changes_name, changes_path) in package.changes.iter() { let dput = match repo_info.dput { Some(some) => some, diff --git a/scripts/pop-ci/src/repo.rs b/scripts/pop-ci/src/repo.rs index a20f4d23..95e706e5 100644 --- a/scripts/pop-ci/src/repo.rs +++ b/scripts/pop-ci/src/repo.rs @@ -102,7 +102,7 @@ impl RepoInfo { _ => Self { key: fs::canonicalize("scripts/.iso.asc").expect("failed to find ISO key"), release: "http://apt.pop-os.org/release", - staging: "http://apt.pop-os.org/staging/master", + staging: "http://apt.pop-os.org/staging/main", dput: None, archs: ARCHS, },