Skip to content

Commit

Permalink
Packit: enable eln builds, enable wasmedge on all non-eln builds
Browse files Browse the repository at this point in the history
The pre-merge copr build tasks for centos stream now use `epel-next`
environments, where wasmedge is available by default. So, wasmedge
support can be enabled for all non-ELN builds, including copr and koji.

This commit also enables Fedora eln builds in .packit.yaml.

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
  • Loading branch information
lsm5 committed Aug 10, 2023
1 parent 995ccae commit 9864f09
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
2 changes: 2 additions & 0 deletions .packit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,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
Expand Down
7 changes: 3 additions & 4 deletions rpm/crun.spec
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
%ifarch aarch64 || x86_64
%global wasm_support 1

# wasmedge only found on Fedora and environments with epel enabled
%if %{defined fedora} || (%{defined copr_project} && "%{copr_project}" == "podman-next")
# wasmedge not present on Fedora ELN environments
%if !0%{?eln}
%global wasmedge_support 1
%global wasmedge_opts --with-wasmedge
%endif
Expand Down Expand Up @@ -39,9 +39,9 @@ Epoch: 102
# If you're reading this on dist-git, the version is automatically filled in by Packit.
Version: 0
Release: %autorelease
URL: https://github.com/containers/%{name}
Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz
License: GPL-2.0-only
URL: https://github.com/containers/%{name}
%if %{defined golang_arches_future}
ExclusiveArch: %{golang_arches_future}
%else
Expand All @@ -65,7 +65,6 @@ BuildRequires: protobuf-c-devel
BuildRequires: criu-devel >= 3.17.1-2
Recommends: criu >= 3.17.1
Recommends: criu-libs
BuildRequires: %{_bindir}/go-md2man
%if %{defined wasmedge_support}
BuildRequires: wasmedge-devel
%endif
Expand Down

0 comments on commit 9864f09

Please sign in to comment.