diff --git a/docs/ahriman.application.handlers.rst b/docs/ahriman.application.handlers.rst index 54beda58..006262a0 100644 --- a/docs/ahriman.application.handlers.rst +++ b/docs/ahriman.application.handlers.rst @@ -20,6 +20,14 @@ ahriman.application.handlers.backup module :no-undoc-members: :show-inheritance: +ahriman.application.handlers.change module +------------------------------------------ + +.. automodule:: ahriman.application.handlers.change + :members: + :no-undoc-members: + :show-inheritance: + ahriman.application.handlers.clean module ----------------------------------------- diff --git a/docs/ahriman.core.database.migrations.rst b/docs/ahriman.core.database.migrations.rst index 88a69538..30cb7d28 100644 --- a/docs/ahriman.core.database.migrations.rst +++ b/docs/ahriman.core.database.migrations.rst @@ -100,6 +100,14 @@ ahriman.core.database.migrations.m011\_repository\_name module :no-undoc-members: :show-inheritance: +ahriman.core.database.migrations.m012\_last\_commit\_sha module +--------------------------------------------------------------- + +.. automodule:: ahriman.core.database.migrations.m012_last_commit_sha + :members: + :no-undoc-members: + :show-inheritance: + Module contents --------------- diff --git a/docs/ahriman.core.database.operations.rst b/docs/ahriman.core.database.operations.rst index 4a8887f0..c2d38a94 100644 --- a/docs/ahriman.core.database.operations.rst +++ b/docs/ahriman.core.database.operations.rst @@ -20,6 +20,14 @@ ahriman.core.database.operations.build\_operations module :no-undoc-members: :show-inheritance: +ahriman.core.database.operations.changes\_operations module +----------------------------------------------------------- + +.. automodule:: ahriman.core.database.operations.changes_operations + :members: + :no-undoc-members: + :show-inheritance: + ahriman.core.database.operations.logs\_operations module -------------------------------------------------------- diff --git a/docs/ahriman.core.formatters.rst b/docs/ahriman.core.formatters.rst index 59c4e20e..d1a84336 100644 --- a/docs/ahriman.core.formatters.rst +++ b/docs/ahriman.core.formatters.rst @@ -20,6 +20,14 @@ ahriman.core.formatters.build\_printer module :no-undoc-members: :show-inheritance: +ahriman.core.formatters.changes\_printer module +----------------------------------------------- + +.. automodule:: ahriman.core.formatters.changes_printer + :members: + :no-undoc-members: + :show-inheritance: + ahriman.core.formatters.configuration\_paths\_printer module ------------------------------------------------------------ diff --git a/docs/ahriman.core.repository.rst b/docs/ahriman.core.repository.rst index 7d7ece58..21b9a99d 100644 --- a/docs/ahriman.core.repository.rst +++ b/docs/ahriman.core.repository.rst @@ -20,6 +20,14 @@ ahriman.core.repository.executor module :no-undoc-members: :show-inheritance: +ahriman.core.repository.package\_info module +-------------------------------------------- + +.. automodule:: ahriman.core.repository.package_info + :members: + :no-undoc-members: + :show-inheritance: + ahriman.core.repository.repository module ----------------------------------------- diff --git a/docs/ahriman.models.rst b/docs/ahriman.models.rst index def2881f..13fc69a2 100644 --- a/docs/ahriman.models.rst +++ b/docs/ahriman.models.rst @@ -36,6 +36,14 @@ ahriman.models.build\_status module :no-undoc-members: :show-inheritance: +ahriman.models.changes module +----------------------------- + +.. automodule:: ahriman.models.changes + :members: + :no-undoc-members: + :show-inheritance: + ahriman.models.context\_key module ---------------------------------- diff --git a/docs/ahriman.web.schemas.rst b/docs/ahriman.web.schemas.rst index bae2e6f8..83691510 100644 --- a/docs/ahriman.web.schemas.rst +++ b/docs/ahriman.web.schemas.rst @@ -20,6 +20,14 @@ ahriman.web.schemas.auth\_schema module :no-undoc-members: :show-inheritance: +ahriman.web.schemas.changes\_schema module +------------------------------------------ + +.. automodule:: ahriman.web.schemas.changes_schema + :members: + :no-undoc-members: + :show-inheritance: + ahriman.web.schemas.counters\_schema module ------------------------------------------- diff --git a/docs/ahriman.web.views.v1.status.rst b/docs/ahriman.web.views.v1.status.rst index d2095538..54ae2539 100644 --- a/docs/ahriman.web.views.v1.status.rst +++ b/docs/ahriman.web.views.v1.status.rst @@ -4,6 +4,14 @@ ahriman.web.views.v1.status package Submodules ---------- +ahriman.web.views.v1.status.changes module +------------------------------------------ + +.. automodule:: ahriman.web.views.v1.status.changes + :members: + :no-undoc-members: + :show-inheritance: + ahriman.web.views.v1.status.logs module --------------------------------------- diff --git a/docs/faq.rst b/docs/faq.rst index e5e6222d..d90c11af 100644 --- a/docs/faq.rst +++ b/docs/faq.rst @@ -114,8 +114,8 @@ But for some cases you would like to have multiple different reports with the sa type = email ... -How do I add new package -^^^^^^^^^^^^^^^^^^^^^^^^ +How to add new package +^^^^^^^^^^^^^^^^^^^^^^ .. code-block:: shell @@ -237,6 +237,27 @@ Normally the service handles VCS packages correctly, however it requires additio pacman -S breezy darcs mercurial subversion +How to review changes before build +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +In this scenario, the update process must be separated to several stages. First, it is required to check updates: + +.. code-block:: shell + + sudo -u ahriman ahriman repo-check + +During the check process, the service will generate changes from the last known commit and will send it to remote service. In order to verify source files changes, the web interface or special subcommand can be used: + +.. code-block:: shell + + ahriman package-changes ahriman + +After validation, the operator can run update process with approved list of packages, e.g.: + +.. code-block:: shell + + sudo -u ahriman ahriman repo-update ahriman + How to remove package ^^^^^^^^^^^^^^^^^^^^^ diff --git a/package/lib/systemd/system/ahriman@.service b/package/lib/systemd/system/ahriman@.service index 10b95123..5d199d20 100644 --- a/package/lib/systemd/system/ahriman@.service +++ b/package/lib/systemd/system/ahriman@.service @@ -2,6 +2,6 @@ Description=ArcH linux ReposItory MANager (%i) [Service] -ExecStart=/usr/bin/ahriman --repository-id "%I" repo-update --refresh +ExecStart=/usr/bin/ahriman --repository-id "%I" repo-update --no-changes --refresh User=ahriman Group=ahriman \ No newline at end of file diff --git a/package/share/ahriman/templates/build-status/package-info-modal.jinja2 b/package/share/ahriman/templates/build-status/package-info-modal.jinja2 index 6de5fee5..912755f4 100644 --- a/package/share/ahriman/templates/build-status/package-info-modal.jinja2 +++ b/package/share/ahriman/templates/build-status/package-info-modal.jinja2 @@ -36,13 +36,27 @@
-

Environment variables

-
+ -

Build logs

-
+ +
+
+
+
+
+
+
+
@@ -68,9 +82,11 @@ packageInfoUpstreamUrl.empty(); packageInfoVersion.empty(); + packageInfoVariablesBlock.attr("hidden", true); packageInfoVariablesDiv.empty(); packageInfoLogsInput.empty(); + packageInfoChangesInput.empty(); packageInfoModal.trigger("reset"); @@ -80,6 +96,9 @@ const packageInfoLogsInput = $("#package-info-logs-input"); const packageInfoLogsCopyButton = $("#package-info-logs-copy-button"); + const packageInfoChangesInput = $("#package-info-changes-input"); + const packageInfoChangesCopyButton = $("#package-info-changes-copy-button"); + const packageInfoAurUrl = $("#package-info-aur-url"); const packageInfoDepends = $("#package-info-depends"); const packageInfoGroups = $("#package-info-groups"); @@ -89,8 +108,14 @@ const packageInfoUpstreamUrl = $("#package-info-upstream-url"); const packageInfoVersion = $("#package-info-version"); + const packageInfoVariablesBlock = $("#package-info-variables-block"); const packageInfoVariablesDiv = $("#package-info-variables-div"); + async function copyChanges() { + const changes = packageInfoChangesInput.text(); + await copyToClipboard(changes, packageInfoChangesCopyButton); + } + async function copyLogs() { const logs = packageInfoLogsInput.text(); await copyToClipboard(logs, packageInfoLogsCopyButton); @@ -142,6 +167,24 @@ packageInfoVariablesDiv.append(variableInput); } + function loadChanges(packageBase, onFailure) { + $.ajax({ + url: `/api/v1/packages/${packageBase}/changes`, + data: { + architecture: repository.architecture, + repository: repository.repository, + }, + type: "GET", + dataType: "json", + success: response => { + const changes = response.changes; + packageInfoChangesInput.text(changes || ""); + packageInfoChangesInput.map((_, el) => hljs.highlightElement(el)); + }, + error: onFailure, + }); + } + function loadLogs(packageBase, onFailure) { $.ajax({ url: `/api/v2/packages/${packageBase}/logs`, @@ -156,6 +199,7 @@ return `[${new Date(1000 * log_record.created).toISOString()}] ${log_record.message}`; }); packageInfoLogsInput.text(logs.join("\n")); + packageInfoLogsInput.map((_, el) => hljs.highlightElement(el)); }, error: onFailure, }); @@ -228,6 +272,7 @@ success: response => { packageInfoVariablesDiv.empty(); response.map(patch => insertVariable(packageBase, patch)); + packageInfoVariablesBlock.attr("hidden", response.length === 0); }, error: onFailure, }); @@ -260,6 +305,7 @@ loadPackage(packageBase, onFailure); loadPatches(packageBase, onFailure); loadLogs(packageBase, onFailure); + loadChanges(packageBase, onFailure) if (isPackageBaseSet) packageInfoModal.modal("show"); } diff --git a/package/share/ahriman/templates/utils/bootstrap-scripts.jinja2 b/package/share/ahriman/templates/utils/bootstrap-scripts.jinja2 index 3384f129..859ef8b1 100644 --- a/package/share/ahriman/templates/utils/bootstrap-scripts.jinja2 +++ b/package/share/ahriman/templates/utils/bootstrap-scripts.jinja2 @@ -15,6 +15,8 @@ + +