From 2e1d4978d457e681ae7e2584280a574cbf8ffce7 Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Thu, 23 Mar 2023 14:50:15 +0100 Subject: [PATCH] Use xmllint instead of xmlstarlet Closes: https://github.com/gentoo/api-gentoo-org/pull/593 Signed-off-by: Florian Schmaus Suggested-by: Robin H. Johnson --- .github/workflows/ci.yml | 2 +- files/mirrors/Makefile | 2 +- files/overlays/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d2050f19ca..dd299ab601 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,7 +9,7 @@ jobs: - name: Install dependencies run: | sudo apt update - sudo apt install libxml2-utils xmlstarlet + sudo apt install libxml2-utils - uses: actions/setup-python@v4 with: python-version: '3.x' diff --git a/files/mirrors/Makefile b/files/mirrors/Makefile index 3aebd33c3c..621742c61a 100644 --- a/files/mirrors/Makefile +++ b/files/mirrors/Makefile @@ -1,5 +1,5 @@ .%.expected-format.xml: %.xml - xmlstarlet fo --encode utf-8 $^ > $@ + xmllint --format $^ > $@ .ONESHELL: .%.expected-format.xml.ok: SHELL = /bin/bash diff --git a/files/overlays/Makefile b/files/overlays/Makefile index 6e5e430390..b6e73eb8d7 100644 --- a/files/overlays/Makefile +++ b/files/overlays/Makefile @@ -37,7 +37,7 @@ format: .repositories-expected-format.xml cmp -s repositories.xml $^ || cp $^ repositories.xml .repositories-expected-format.xml: repositories.xml - xmlstarlet fo $^ > $@ + xmllint --format $^ > $@ .ONESHELL: .repositories-style-ok: SHELL = /bin/bash