From 6e1567e6db786cff734eaecf35077fdebb02ce8a Mon Sep 17 00:00:00 2001 From: Evgenii Alekseev Date: Tue, 14 Jul 2026 16:16:06 +0300 Subject: [PATCH] fix tox environments --- {package/archlinux => archlinux}/PKGBUILD | 0 {package/archlinux => archlinux}/ahriman.install | 0 {package/archlinux => archlinux}/ahriman.sysusers | 0 {package/archlinux => archlinux}/ahriman.tmpfiles | 0 docker/Dockerfile | 4 ++-- tox.toml | 8 ++++---- 6 files changed, 6 insertions(+), 6 deletions(-) rename {package/archlinux => archlinux}/PKGBUILD (100%) rename {package/archlinux => archlinux}/ahriman.install (100%) rename {package/archlinux => archlinux}/ahriman.sysusers (100%) rename {package/archlinux => archlinux}/ahriman.tmpfiles (100%) diff --git a/package/archlinux/PKGBUILD b/archlinux/PKGBUILD similarity index 100% rename from package/archlinux/PKGBUILD rename to archlinux/PKGBUILD diff --git a/package/archlinux/ahriman.install b/archlinux/ahriman.install similarity index 100% rename from package/archlinux/ahriman.install rename to archlinux/ahriman.install diff --git a/package/archlinux/ahriman.sysusers b/archlinux/ahriman.sysusers similarity index 100% rename from package/archlinux/ahriman.sysusers rename to archlinux/ahriman.sysusers diff --git a/package/archlinux/ahriman.tmpfiles b/archlinux/ahriman.tmpfiles similarity index 100% rename from package/archlinux/ahriman.tmpfiles rename to archlinux/ahriman.tmpfiles diff --git a/docker/Dockerfile b/docker/Dockerfile index d1b986c1..fd34a43d 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -68,8 +68,8 @@ COPY --chown=build . "/home/build/ahriman" ## create package archive and install it RUN cd "/home/build/ahriman" && \ tox -e archive && \ - cp ./dist/*.tar.gz "package/archlinux" && \ - cd "package/archlinux" && \ + cp ./dist/*.tar.gz "archlinux" && \ + cd "archlinux" && \ runuser -u build -- makepkg --noconfirm --skipchecksums && \ cd / && rm -r "/home/build/ahriman" diff --git a/tox.toml b/tox.toml index 30015da1..96f0f8d0 100644 --- a/tox.toml +++ b/tox.toml @@ -91,7 +91,6 @@ deps = [ { replace = "ref", of = ["project", "extras"], extend = true }, ] pip_pre = true -skip_install = true set_env.CFLAGS = "-Wno-unterminated-string-initialization" set_env.MYPYPATH = "ahriman-core/src:ahriman-triggers/src:ahriman-web/src" commands = [ @@ -243,7 +242,7 @@ commands = [ "sphinx-build", "--builder", "html", "--fail-on-warning", - "--jobs", "auto", + "--jobs", "1", "--write-all", "docs", "{envtmpdir}/html", @@ -265,9 +264,9 @@ commands = [ [ "git", "add", + "archlinux/PKGBUILD", "docs/_static/architecture.dot", "frontend/package.json", - "package/archlinux/PKGBUILD", "ahriman-core/package/share/man/man1/ahriman.1", "ahriman-core/package/share/bash-completion/completions/_ahriman", "ahriman-core/package/share/zsh/site-functions/_ahriman", @@ -324,6 +323,7 @@ allowlist_externals = [ deps = [ "packaging", ] +skip_install = true commands = [ # check if version is set and validate it [ @@ -346,6 +346,6 @@ commands = [ "sed", "--in-place", "s/pkgver=.*/pkgver={posargs}/", - "package/archlinux/PKGBUILD", + "archlinux/PKGBUILD", ], ]