From ed2a501c955260ecc412266b889178fc79fcaa86 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 9 Aug 2023 14:38:51 -0400 Subject: [PATCH 1/2] [CI:BUILD] RPM: build docs with vendored go-md2man [NO NEW TESTS NEEDED] Signed-off-by: Lokesh Mandvekar --- rpm/buildah.spec | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/rpm/buildah.spec b/rpm/buildah.spec index 897c95c7e3..38fd88a09b 100644 --- a/rpm/buildah.spec +++ b/rpm/buildah.spec @@ -47,7 +47,6 @@ Summary: A command line tool used for creating OCI Images URL: https://%{name}.io # Tarball fetched from upstream Source: %{git0}/archive/v%{version}.tar.gz -BuildRequires: %{_bindir}/go-md2man BuildRequires: device-mapper-devel BuildRequires: git-core BuildRequires: golang >= 1.16.6 @@ -129,12 +128,10 @@ export BUILDTAGS+=' btrfs_noversion exclude_graphdriver_btrfs' %gobuild -o bin/imgtype ./tests/imgtype %gobuild -o bin/copy ./tests/copy %gobuild -o bin/tutorial ./tests/tutorial -GOMD2MAN=go-md2man %{__make} -C docs +%{__make} docs %install -export GOPATH=$(pwd)/_build:$(pwd) make DESTDIR=%{buildroot} PREFIX=%{_prefix} install install.completions -make DESTDIR=%{buildroot} PREFIX=%{_prefix} -C docs install install -d -p %{buildroot}/%{_datadir}/%{name}/test/system cp -pav tests/. %{buildroot}/%{_datadir}/%{name}/test/system @@ -142,6 +139,8 @@ cp bin/imgtype %{buildroot}/%{_bindir}/%{name}-imgtype cp bin/copy %{buildroot}/%{_bindir}/%{name}-copy cp bin/tutorial %{buildroot}/%{_bindir}/%{name}-tutorial +rm %{buildroot}%{_datadir}/%{name}/test/system/tools/build/* + #define license tag if not already defined %{!?_licensedir:%global license %doc} From 9ab3b526db6a367774cd0da9a7bc32bafe2dde04 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 9 Aug 2023 10:08:21 -0400 Subject: [PATCH 2/2] [CI:BUILD] Packit: add fedora-eln targets `fedora-all` doesn't include eln targets. We need to add them explicitly. [NO NEW TESTS NEEDED] Signed-off-by: Lokesh Mandvekar --- .packit.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.packit.yaml b/.packit.yaml index 35453b6306..80f8a05e48 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -16,6 +16,8 @@ jobs: targets: - fedora-all-x86_64 - fedora-all-aarch64 + - fedora-eln-x86_64 + - fedora-eln-aarch64 - centos-stream+epel-next-8-x86_64 - centos-stream+epel-next-8-aarch64 - centos-stream+epel-next-9-x86_64