diff --git a/.gitignore b/.gitignore index 069b25d..c3f5790 100644 --- a/.gitignore +++ b/.gitignore @@ -697,3 +697,19 @@ /v1.30.0.tar.gz /v1.31.0.tar.gz /v1.31.1.tar.gz +/v1.31.2.tar.gz +/v1.31.3.tar.gz +/v1.32.0.tar.gz +/v1.32.1.tar.gz +/v1.32.2.tar.gz +/v1.33.2.tar.gz +/v1.34.0.tar.gz +/v1.34.1.tar.gz +/v1.35.0.tar.gz +/v1.35.1.tar.gz +/v1.35.2.tar.gz +/v1.35.3.tar.gz +/v1.35.4.tar.gz +/v1.36.0.tar.gz +/v1.37.0.tar.gz +/v1.37.1.tar.gz diff --git a/.packit.yaml b/.packit.yaml new file mode 100644 index 0000000..b465fec --- /dev/null +++ b/.packit.yaml @@ -0,0 +1,95 @@ +--- +# See the documentation for more information: +# https://packit.dev/docs/configuration/ + +downstream_package_name: buildah +upstream_tag_template: v{version} + +packages: + buildah-fedora: + pkg_tool: fedpkg + specfile_path: rpm/buildah.spec + buildah-centos: + pkg_tool: centpkg + specfile_path: rpm/buildah.spec + buildah-rhel: + specfile_path: rpm/buildah.spec + +srpm_build_deps: + - make + +jobs: + - job: copr_build + trigger: pull_request + packages: [buildah-fedora] + notifications: &copr_build_failure_notification + failure_comment: + message: "Ephemeral COPR build failed. @containers/packit-build please check." + targets: + fedora-all-x86_64: {} + fedora-all-aarch64: {} + fedora-eln-x86_64: + additional_repos: + - "https://kojipkgs.fedoraproject.org/repos/eln-build/latest/x86_64/" + fedora-eln-aarch64: + additional_repos: + - "https://kojipkgs.fedoraproject.org/repos/eln-build/latest/aarch64/" + enable_net: true + + - job: copr_build + trigger: pull_request + packages: [buildah-centos] + notifications: *copr_build_failure_notification + targets: + - centos-stream-9-x86_64 + - centos-stream-9-aarch64 + - centos-stream-10-x86_64 + - centos-stream-10-aarch64 + enable_net: true + + - job: copr_build + trigger: pull_request + packages: [buildah-rhel] + notifications: *copr_build_failure_notification + targets: + - epel-9-x86_64 + - epel-9-aarch64 + enable_net: true + + # Run on commit to main branch + - job: copr_build + trigger: commit + packages: [buildah-fedora] + notifications: + failure_comment: + message: "podman-next COPR build failed. @containers/packit-build please check." + branch: main + owner: rhcontainerbot + project: podman-next + enable_net: true + + # Sync to Fedora + - job: propose_downstream + trigger: release + packages: [buildah-fedora] + update_release: false + dist_git_branches: + - fedora-all + + # Sync to CentOS Stream + - job: propose_downstream + trigger: release + packages: [buildah-centos] + update_release: false + dist_git_branches: + - c10s + + - job: koji_build + trigger: commit + dist_git_branches: + - fedora-all + + - job: bodhi_update + trigger: commit + dist_git_branches: + - fedora-branched # rawhide updates are created automatically diff --git a/README.packit b/README.packit new file mode 100644 index 0000000..4df53f3 --- /dev/null +++ b/README.packit @@ -0,0 +1,3 @@ +This repository is maintained by packit. +https://packit.dev/ +The file was generated using packit 0.100.1. diff --git a/buildah.spec b/buildah.spec index 7eeba61..c5e10b3 100644 --- a/buildah.spec +++ b/buildah.spec @@ -35,8 +35,9 @@ Epoch: 102 # 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: 1.31.1 -License: Apache-2.0 and BSD-2-Clause and BSD-3-Clause and ISC and MIT and MPL-2.0 +Version: 1.37.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 %if %{defined golang_arches_future} ExclusiveArch: %{golang_arches_future} @@ -85,7 +86,9 @@ or Summary: Tests for %{name} Requires: %{name} = %{version}-%{release} +%if %{defined fedora} Requires: bats +%endif Requires: bzip2 Requires: podman Requires: golang @@ -119,9 +122,9 @@ export CGO_CFLAGS+=" -m64 -mtune=generic -fcf-protection=full" export CNI_VERSION=`grep '^# github.com/containernetworking/cni ' src/modules.txt | sed 's,.* ,,'` export LDFLAGS="-X main.buildInfo=`date +%s` -X main.cniVersion=${CNI_VERSION}" -export BUILDTAGS='seccomp exclude_graphdriver_devicemapper $(hack/systemd_tag.sh) $hack/libsubid_tag.sh)' +export BUILDTAGS="seccomp exclude_graphdriver_devicemapper $(hack/systemd_tag.sh) $(hack/libsubid_tag.sh)" %if !%{defined build_with_btrfs} -export BUILDTAGS+=' btrfs_noversion exclude_graphdriver_btrfs' +export BUILDTAGS+=" btrfs_noversion exclude_graphdriver_btrfs" %endif %gobuild -o bin/%{name} ./cmd/%{name} @@ -145,7 +148,7 @@ rm %{buildroot}%{_datadir}/%{name}/test/system/tools/build/* %{!?_licensedir:%global license %doc} %files -%license LICENSE +%license LICENSE vendor/modules.txt %doc README.md %{_bindir}/%{name} %{_mandir}/man1/%{name}* diff --git a/sources b/sources index 1be5825..ebe2ecb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v1.31.1.tar.gz) = 7375877d964197d0690542e1da0636b0a67cdf01f30ddbdd69cced5cfe4f8bb370b37ec58f2dffd2c2f048b897470d8fb06cd9f70c8e75df2aa6b19f86610f7b +SHA512 (v1.37.1.tar.gz) = b36dd0c9ccac399550232fe1b7024f8969fa9086efe9cdf8a8ed10ad3c3d3bad4095a7ac17ed41ccb670a781a975dea36f1ad99ba6ae15d7b2b4d728399c5e36