diff --git a/.gitignore b/.gitignore index f6598e3..bc73427 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,5 @@ /v1.6.0.tar.gz /v1.7.0.tar.gz /aardvark-dns-v1.7.0-vendor.tar.gz +/v1.8.0.tar.gz +/aardvark-dns-v1.8.0-vendor.tar.gz diff --git a/.packit.yaml b/.packit.yaml index a4ed4b1..51b7886 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -2,40 +2,47 @@ # See the documentation for more information: # https://packit.dev/docs/configuration/ -# COPR build targets can be found at: -# https://copr.fedorainfracloud.org/coprs/rhcontainerbot/packit-builds/ -# and -# https://copr.fedorainfracloud.org/coprs/rhcontainerbot/podman-next/ - specfile_path: rpm/aardvark-dns.spec upstream_tag_template: v{version} -jobs: - - &copr - job: copr_build - trigger: pull_request - owner: rhcontainerbot - project: packit-builds - enable_net: true - srpm_build_deps: - - cargo - - make - - openssl-devel +srpm_build_deps: + - cargo + - make + - openssl-devel - - <<: *copr - # Run on commit to main branch +jobs: + - job: copr_build + trigger: pull_request + notifications: + failure_comment: + message: "Ephemeral COPR build failed. @containers/packit-build please check." + enable_net: true + targets: + - fedora-all-x86_64 + - fedora-all-aarch64 + - centos-stream+epel-next-8-x86_64 + - centos-stream+epel-next-8-aarch64 + - centos-stream+epel-next-9-x86_64 + - centos-stream+epel-next-9-aarch64 + additional_repos: + - "copr://rhcontainerbot/podman-next" + + # Run on commit to main branch + - job: copr_build trigger: commit + notifications: + failure_comment: + message: "podman-next COPR build failed. @containers/packit-build please check." branch: main + owner: rhcontainerbot project: podman-next + enable_net: true - job: propose_downstream trigger: release update_release: false dist_git_branches: - fedora-all - actions: - pre-sync: - - "bash rpm/update-spec-provides.sh" - job: koji_build trigger: commit diff --git a/README.packit b/README.packit index 101115f..8b12de4 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.77.0.post2+g06f877b. +The file was generated using packit 0.81.0.post1.dev4+g3347ce2b. diff --git a/aardvark-dns.spec b/aardvark-dns.spec index 59920ef..cdbaaf1 100644 --- a/aardvark-dns.spec +++ b/aardvark-dns.spec @@ -18,30 +18,8 @@ %global debug_package %{nil} %endif -# copr_username is only set on copr environments owned by rhcontainerbot, -# not on other coprs or environments like koji. -%if %{defined copr_username} && "%{?copr_username}" == "rhcontainerbot" -%bcond_without copr -%else -%bcond_with copr -%endif - -# rhel 8 does not support %%autochangelog -%if %{defined rhel} && 0%{?rhel} <= 8 -%bcond_without manual_changelog -%else -%bcond_with manual_changelog -%endif - -# rhel does not define %%{golang_arches_future} -%if %{defined fedora} -%bcond_without golang_arches_future -%else -%bcond_with golang_arches_future -%endif - Name: aardvark-dns -%if %{with copr} +%if %{defined copr_username} Epoch: 102 %endif # DO NOT TOUCH the Version string! @@ -50,10 +28,11 @@ 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.7.0 +Version: 1.8.0 +# The `AND` needs to be uppercase in the License for SPDX compatibility License: Apache-2.0 AND MIT AND Zlib Release: %autorelease -%if %{with golang_arches_future} +%if %{defined golang_arches_future} ExclusiveArch: %{golang_arches_future} %else ExclusiveArch: aarch64 ppc64le s390x x86_64 @@ -67,13 +46,12 @@ BuildRequires: cargo BuildRequires: git-core BuildRequires: make %if %{defined rhel} +# rust-toolset requires the `local` repo enabled on non-koji ELN build environments BuildRequires: rust-toolset %else BuildRequires: rust-packaging BuildRequires: rust-srpm-macros %endif -# DO NOT DELETE BELOW LINE - used for updating downstream imports -# vendored libraries %description %{summary} @@ -86,7 +64,7 @@ Read more about configuration in `src/backend/mod.rs`. # Following steps are only required on environments like koji which have no # network access and thus depend on the vendored tarball. Copr pulls # dependencies directly from the network. -%if %{without copr} +%if !%{defined copr_username} tar fx %{SOURCE1} mkdir -p .cargo diff --git a/sources b/sources index 3dd3bb8..8304be9 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (v1.7.0.tar.gz) = d829ac122f26f17ca44a41a48576ab8c4f9dd238bc52faee816833f63f9ff54e63f62610167e4619084263e61cdb1329c2e1d49f314c8b9e65e748df80fd5096 -SHA512 (aardvark-dns-v1.7.0-vendor.tar.gz) = 07d3ebc7504fc1e4c0fe9b5f3760bdbe9b4153678aae962c9e37a0097bee832b0e4e77fadfc475c82fa05ffaa1a04f53df8f92b63e23b09da05e5e2efaa07c94 +SHA512 (v1.8.0.tar.gz) = 271f11d6b8779938682da2affce80601bc642df768b7d868176d641e216c0acff2029a8ed39a20ca25d116ddd694603d67672d3ec6672be29ff6b43ad8bf90d1 +SHA512 (aardvark-dns-v1.8.0-vendor.tar.gz) = da300932f27f3fcde2f3bc2b67f0e5eb2184c428274844363fdaccc29c845e7f2efc238019f4bf3ff10bcd3e867a1d9dc603a0fac37686e579f47a3ac9cb2e55