diff --git a/docs/spec/xbps-proof-results.md b/docs/spec/xbps-proof-results.md index 59c566e..8d37668 100644 --- a/docs/spec/xbps-proof-results.md +++ b/docs/spec/xbps-proof-results.md @@ -130,9 +130,9 @@ Users add the repository to `/etc/xbps.d/xbps.conf`: repository=https://git.bongbetic.com/xavierk/Fenris-xbps/raw/branch/stable/x86_64 ``` -Or install directly: +Or make a one-off request without writing the configuration file: ```sh -sudo xbps-install -S https://git.bongbetic.com/xavierk/Fenris-xbps/raw/branch/stable/x86_64 +sudo xbps-install -R https://git.bongbetic.com/xavierk/Fenris-xbps/raw/branch/stable/x86_64 -M -S fenris ``` ## Publication Mechanism diff --git a/packaging/release-footer.md b/packaging/release-footer.md index 063ae6e..d879533 100644 --- a/packaging/release-footer.md +++ b/packaging/release-footer.md @@ -12,7 +12,10 @@ sudo xbps-install fenris # Void Linux For Void Linux, configure the XBPS repository first: ```bash -sudo xbps-install -S https://git.bongbetic.com/xavierk/Fenris-xbps/raw/branch/stable/x86_64 +sudo install -d -m 0755 /etc/xbps.d +echo 'repository=https://git.bongbetic.com/xavierk/Fenris-xbps/raw/branch/stable/x86_64' \ + | sudo tee /etc/xbps.d/fenris.conf +sudo xbps-install -M -S fenris ``` ## Verify downloads diff --git a/scripts/xbps-publish.sh b/scripts/xbps-publish.sh index f9ebfed..c7bf802 100755 --- a/scripts/xbps-publish.sh +++ b/scripts/xbps-publish.sh @@ -201,7 +201,8 @@ echo " Branch: ${GITEA_BRANCH}" echo " Repository URL: https://git.bongbetic.com/${GITEA_OWNER}/${GITEA_REPO}/raw/branch/${GITEA_BRANCH}/${ARCH}" echo "" echo "Client installation:" -echo " sudo xbps-install -S https://git.bongbetic.com/${GITEA_OWNER}/${GITEA_REPO}/raw/branch/${GITEA_BRANCH}/${ARCH}" +echo " echo 'repository=https://git.bongbetic.com/${GITEA_OWNER}/${GITEA_REPO}/raw/branch/${GITEA_BRANCH}/${ARCH}' | sudo tee /etc/xbps.d/fenris.conf" +echo " sudo xbps-install -M -S fenris" echo "" echo "Key ceremony: delete the private key after publication." echo " See docs/install/signing-key-ceremony.md" diff --git a/tests/test_changelog.py b/tests/test_changelog.py index b117c3f..418a27f 100644 --- a/tests/test_changelog.py +++ b/tests/test_changelog.py @@ -79,6 +79,20 @@ def test_release_footer_verifies_the_clearsigned_checksum_asset(): assert "sha256sum -c SHA256SUMS" in footer +def test_release_footer_configures_the_xbps_url_as_a_repository(): + footer = (REPO_ROOT / "packaging" / "release-footer.md").read_text( + encoding="utf-8" + ) + + repository = ( + "repository=https://git.bongbetic.com/xavierk/Fenris-xbps/" + "raw/branch/stable/x86_64" + ) + assert repository in footer + assert "sudo xbps-install -M -S fenris" in footer + assert "sudo xbps-install -S https://git.bongbetic.com" not in footer + + @pytest.mark.parametrize( ("changelog", "expected_error"), [