[libvirt PATCH 11/33] ci: build.sh: Add a wrapper function over the 'rpmbuild' job
Erik Skultety
eskultet at redhat.com
Fri Sep 1 09:05:52 UTC 2023
On Fri, Aug 25, 2023 at 07:55:19PM +0200, Erik Skultety wrote:
> This helper is a shell function transcript of its original GitLab CI
> counterpart.
>
> Signed-off-by: Erik Skultety <eskultet at redhat.com>
> ---
> ci/build.sh | 11 +++++++++++
> 1 file changed, 11 insertions(+)
>
> diff --git a/ci/build.sh b/ci/build.sh
> index 6990f2d171..30f4712e4b 100644
> --- a/ci/build.sh
> +++ b/ci/build.sh
> @@ -94,3 +94,14 @@ run_potfile() {
> run_meson_setup
> run_build
> }
> +
> +run_rpmbuild() {
> + local CMD="rpmbuild \
> + --clean \
> + --nodeps \
> + --define "_without_mingw 1" \
> + -ta build/meson-dist/libvirt-*.tar.xz"
> +
> + run_meson_setup
> + run_dist
> +}
> --
> 2.41.0
>
Consider the following squashed in:
diff --git a/ci/build.sh b/ci/build.sh
index 5eef53f8d1..b990f5eeac 100644
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -87,6 +87,7 @@ run_rpmbuild() {
run_meson_setup
run_dist
+ run_cmd "$CMD"
}
AND
diff --git a/ci/build.sh b/ci/build.sh
index b990f5eeac..a45bc2b110 100644
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -82,7 +82,7 @@ run_rpmbuild() {
local CMD="rpmbuild \
--clean \
--nodeps \
- --define "_without_mingw 1" \
+ --define '_without_mingw 1' \
-ta build/meson-dist/libvirt-*.tar.xz"
run_meson_setup
Regards,
Erik
More information about the libvir-list
mailing list