migrate to the latest devtools & archlinux git changes

This migration includes
* removal of community repository as it is no more
* fixed paths for devtools configurations
* migration of archlinux packaging git url
This commit is contained in:
2023-05-22 16:28:53 +03:00
parent 8c55438140
commit 70e9e3e822
10 changed files with 24 additions and 35 deletions

View File

@ -25,7 +25,7 @@ def _default_args(args: argparse.Namespace) -> argparse.Namespace:
"""
args.build_as_user = "ahriman"
args.build_command = "ahriman"
args.from_configuration = Path("/usr/share/devtools/pacman-extra.conf")
args.from_configuration = Path("/usr/share/devtools/pacman.conf.d/extra.conf")
args.makeflags_jobs = True
args.mirror = "mirror"
args.multilib = True

View File

@ -50,19 +50,7 @@ def test_remote_git_url(aur_package_akonadi: AURPackage) -> None:
Official.remote_git_url(aur_package_akonadi.package_base, repository)
for repository in ("core", "extra", "Core", "Extra")
]
assert all(git_url.endswith("svntogit-packages.git") for git_url in git_urls)
assert len(set(git_urls)) == 1
def test_remote_git_url_community(aur_package_akonadi: AURPackage) -> None:
"""
must generate package git url for core packages
"""
git_urls = [
Official.remote_git_url(aur_package_akonadi.package_base, repository)
for repository in ("community", "multilib", "Community", "Multilib")
]
assert all(git_url.endswith("svntogit-community.git") for git_url in git_urls)
assert all(git_url.endswith(f"{aur_package_akonadi.package_base}.git") for git_url in git_urls)
assert len(set(git_urls)) == 1

View File

@ -67,8 +67,8 @@ def test_from_source_official(package_ahriman: Package, mocker: MockerFixture) -
remote = RemoteSource.from_source(PackageSource.Repository, package_ahriman.base, "community")
remote_git_url_mock.assert_called_once_with(package_ahriman.base, "community")
remote_web_url_mock.assert_called_once_with(package_ahriman.base)
assert remote.pkgbuild_dir == Path("trunk")
assert remote.branch.endswith(package_ahriman.base)
assert remote.pkgbuild_dir == Path(".")
assert remote.branch == "main"
assert remote.source == PackageSource.Repository

View File

@ -6,7 +6,7 @@ database = ../../../ahriman-test.db
[alpm]
database = /var/lib/pacman
mirror = https://geo.mirror.pkgbuild.com/$repo/os/$arch
repositories = core extra community multilib
repositories = core extra multilib
root = /
use_ahriman_cache = no