Compare commits
8 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3543b6332e | ||
|
|
0ad27144b9 | ||
|
|
84c39aa469 | ||
|
|
952ac8e8ef |
||
|
|
cf87d0372e | ||
|
|
b9905a6e80 | ||
|
|
4de7cbaf06 | ||
|
|
6fc119bf53 |
6 changed files with 37 additions and 23 deletions
7
.gitignore
vendored
7
.gitignore
vendored
|
|
@ -1887,3 +1887,10 @@
|
|||
/v5.5.2.tar.gz
|
||||
/v5.6.0-rc1.tar.gz
|
||||
/v5.6.0-rc2.tar.gz
|
||||
/v5.6.0.tar.gz
|
||||
/v5.6.1.tar.gz
|
||||
/v5.6.2.tar.gz
|
||||
/v5.7.0-rc1.tar.gz
|
||||
/v5.7.0-rc2.tar.gz
|
||||
/v5.7.0.tar.gz
|
||||
/v5.7.1.tar.gz
|
||||
|
|
|
|||
24
.packit.yaml
24
.packit.yaml
|
|
@ -92,9 +92,6 @@ jobs:
|
|||
- job: copr_build
|
||||
trigger: commit
|
||||
packages: [podman-fedora]
|
||||
notifications:
|
||||
failure_comment:
|
||||
message: "podman-next COPR build failed. @containers/packit-build please check."
|
||||
branch: main
|
||||
owner: rhcontainerbot
|
||||
project: podman-next
|
||||
|
|
@ -108,11 +105,6 @@ jobs:
|
|||
targets:
|
||||
- fedora-all
|
||||
tmt_plan: "/plans/system/*"
|
||||
tf_extra_params:
|
||||
environments:
|
||||
- artifacts:
|
||||
- type: repository-file
|
||||
id: https://copr.fedorainfracloud.org/coprs/rhcontainerbot/podman-next/repo/fedora-$releasever/rhcontainerbot-podman-next-fedora-$releasever.repo
|
||||
|
||||
- job: tests
|
||||
identifier: cockpit-revdeps
|
||||
|
|
@ -129,12 +121,24 @@ jobs:
|
|||
- artifacts:
|
||||
- type: repository-file
|
||||
id: https://copr.fedorainfracloud.org/coprs/g/cockpit/main-builds/repo/fedora-$releasever/group_cockpit-main-builds-fedora-$releasever.repo
|
||||
- type: repository-file
|
||||
id: https://copr.fedorainfracloud.org/coprs/rhcontainerbot/podman-next/repo/fedora-$releasever/rhcontainerbot-podman-next-fedora-$releasever.repo
|
||||
tmt:
|
||||
context:
|
||||
revdeps: "yes"
|
||||
|
||||
- job: tests
|
||||
identifier: tmt-revdeps
|
||||
trigger: pull_request
|
||||
packages: [podman-fedora]
|
||||
notifications:
|
||||
failure_comment:
|
||||
message: "tmt tests failed for commit {commit_sha}. @lsm5, @psss, @thrix please check."
|
||||
targets:
|
||||
- fedora-latest
|
||||
fmf_url: https://github.com/teemtee/tmt
|
||||
fmf_path: /plans/friends
|
||||
fmf_ref: main
|
||||
tmt_plan: "/podman"
|
||||
|
||||
- job: propose_downstream
|
||||
trigger: release
|
||||
update_release: false
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
This repository is maintained by packit.
|
||||
https://packit.dev/
|
||||
The file was generated using packit 1.11.0.
|
||||
The file was generated using packit 1.12.0.post1.dev22+gfe66fd850.
|
||||
|
|
|
|||
|
|
@ -14,15 +14,6 @@ prepare:
|
|||
dnf -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-$(rpm --eval '%{?rhel}').noarch.rpm
|
||||
dnf -y config-manager --set-enabled epel
|
||||
order: 10
|
||||
- when: initiator == packit
|
||||
how: shell
|
||||
script: |
|
||||
COPR_REPO_FILE="/etc/yum.repos.d/*podman-next*.repo"
|
||||
if compgen -G $COPR_REPO_FILE > /dev/null; then
|
||||
sed -i -n '/^priority=/!p;$apriority=1' $COPR_REPO_FILE
|
||||
fi
|
||||
dnf -y upgrade --allowerasing
|
||||
order: 20
|
||||
|
||||
adjust+:
|
||||
- enabled: false
|
||||
|
|
|
|||
16
podman.spec
16
podman.spec
|
|
@ -15,6 +15,9 @@
|
|||
%define qemu 1
|
||||
# bats is included in the default repos (No epel/copr etc.)
|
||||
%define distro_bats 1
|
||||
%if %{?fedora} >= 43
|
||||
%define sequoia 1
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%if %{defined copr_username}
|
||||
|
|
@ -60,7 +63,7 @@ Epoch: 5
|
|||
# If that's what you're reading, Version must be 0, and will be updated by Packit for
|
||||
# copr and koji builds.
|
||||
# If you're reading this on dist-git, the version is automatically filled in by Packit.
|
||||
Version: 5.6.0~rc2
|
||||
Version: 5.7.1
|
||||
# The `AND` needs to be uppercase in the License for SPDX compatibility
|
||||
License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0
|
||||
Release: %autorelease
|
||||
|
|
@ -109,6 +112,10 @@ Requires: containers-common-extra >= 5:0.58.0-1
|
|||
%else
|
||||
Requires: containers-common-extra
|
||||
%endif
|
||||
%if %{defined sequoia}
|
||||
Requires: podman-sequoia
|
||||
%endif
|
||||
|
||||
Obsoletes: %{name}-quadlet <= 5:4.4.0-1
|
||||
Provides: %{name}-quadlet = %{epoch}:%{version}-%{release}
|
||||
|
||||
|
|
@ -247,7 +254,7 @@ LDFLAGS="-X %{ld_libpod}/define.buildInfo=${SOURCE_DATE_EPOCH:-$(date +%s)} \
|
|||
|
||||
# This variable will be set by Packit actions. See .packit.yaml in the root dir
|
||||
# of the repo (upstream as well as Fedora dist-git).
|
||||
GIT_COMMIT="ec0652f4ad4c6a5bb039ed6d749e06b7dadbab15"
|
||||
GIT_COMMIT="f845d14e941889ba4c071f35233d09b29d363c75"
|
||||
LDFLAGS="$LDFLAGS -X %{ld_libpod}/define.gitCommit=$GIT_COMMIT"
|
||||
|
||||
# build rootlessport first
|
||||
|
|
@ -265,6 +272,11 @@ export BASEBUILDTAGS="$BASEBUILDTAGS libtrust_openssl"
|
|||
|
||||
# build %%{name}
|
||||
export BUILDTAGS="$BASEBUILDTAGS $(hack/btrfs_installed_tag.sh)"
|
||||
|
||||
%if %{defined sequoia}
|
||||
export BUILDTAGS="$BUILDTAGS containers_image_sequoia"
|
||||
%endif
|
||||
|
||||
%gobuild -o bin/%{name} ./cmd/%{name}
|
||||
|
||||
# build %%{name}-remote
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (v5.6.0-rc2.tar.gz) = 9689d3641ca064a101cba0c38dae7adda47bfae49dff4c67a0a9798865e201b8f035abfbebbdda9003ccd393aa467571a4b7af3dc08206cc717c5f4aa0ad149c
|
||||
SHA512 (v5.7.1.tar.gz) = 81fd4c27ff1d16dcb85229d4e4fd2cb06943ddfe966b5324fa8a8a957b2d2ec2aed7c5da05d6c009148f53b76545b27b0cba506622c8861f70bf7cad6c214a08
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue