Lubuntu/ci-tools
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: Lubuntu:ed1559beb627eba0b21ab888e9334ba0b6327f58
Branches Tags
Lubuntu:main
...
compare: Lubuntu:5f01bf51444df15fdce9256446f1016369aafdb0
Branches Tags
Lubuntu:main

2 Commits
ed1559beb6 ... 5f01bf5144

Author SHA1 Message Date
Simon Quigley
5f01bf5144 Various fixups around shared pointers and commits 2025-02-03 15:24:30 -06:00
Simon Quigley
8b9bd3142a Use the Debian packaging for cmake 2025-02-03 15:21:20 -06:00
2 changed files with 13 additions and 9 deletions
Show Stats Expand all files Collapse all files

6
configs/cmake.yaml
View File

@ -2,9 +2,9 @@ packages:
- name: cmake - name: cmake
upstream_url: "https://gitlab.kitware.com/cmake/cmake.git" upstream_url: "https://gitlab.kitware.com/cmake/cmake.git"
upstream_browser: "https://gitlab.kitware.com/cmake/cmake/-/commit/" upstream_browser: "https://gitlab.kitware.com/cmake/cmake/-/commit/"
packaging_url: "https://git.lubuntu.me/Lubuntu/cmake.git" packaging_url: "https://salsa.debian.org/cmake-team/cmake.git"
packaging_browser: "https://git.lubuntu.me/Lubuntu/cmake/commit/" packaging_browser: "https://salsa.debian.org/cmake-team/cmake/-/commit/"
packaging_branch: "ci/unstable" packaging_branch: "master"
releases: releases:
- plucky - plucky

16
cpp/ci_logic.cpp
View File

@ -321,13 +321,9 @@ bool CiLogic::pull_project(std::shared_ptr<PackageConf> &proj, std::shared_ptr<L
// Now read the HEAD commits and store them // Now read the HEAD commits and store them
log->append("Fetching complete. Storing Git commit data...\n"); log->append("Fetching complete. Storing Git commit data...\n");
if (!proj->packaging_commit) { if (!proj->packaging_commit) proj->packaging_commit = std::make_shared<GitCommit>();
proj->packaging_commit = std::make_unique<GitCommit>(); if (!proj->upstream_commit) proj->upstream_commit = std::make_shared<GitCommit>();
}
if (!proj->upstream_commit) {
proj->upstream_commit = std::make_unique<GitCommit>();
}
*proj->packaging_commit = get_commit_from_pkg_repo(packaging_dir.string(), log); *proj->packaging_commit = get_commit_from_pkg_repo(packaging_dir.string(), log);
*proj->upstream_commit = get_commit_from_pkg_repo(upstream_dir.string(), log); *proj->upstream_commit = get_commit_from_pkg_repo(upstream_dir.string(), log);
proj->sync(); proj->sync();
@ -671,6 +667,14 @@ std::string CiLogic::queue_pull_tarball(std::vector<std::shared_ptr<PackageConf>
*(r->packaging_commit) = *(existing_item->first_pkgconf->packaging_commit); *(r->packaging_commit) = *(existing_item->first_pkgconf->packaging_commit);
*(r->upstream_commit) = *(existing_item->first_pkgconf->upstream_commit); *(r->upstream_commit) = *(existing_item->first_pkgconf->upstream_commit);
if (existing_item->first_pkgconf->packaging_commit) {
if (!r->packaging_commit) r->packaging_commit = std::make_shared<GitCommit>(*(existing_item->first_pkgconf->packaging_commit));
else *(r->packaging_commit) = *(existing_item->first_pkgconf->packaging_commit);
}
if (existing_item->first_pkgconf->upstream_commit) {
if (!r->upstream_commit) r->upstream_commit = std::make_shared<GitCommit>(*(existing_item->first_pkgconf->upstream_commit));
else *(r->upstream_commit) = *(existing_item->first_pkgconf->upstream_commit);
}
r->sync(); r->sync();
continue; continue;
} }