From 93214650f1d2df2c96db5e10de096cfbe0cc64fd Mon Sep 17 00:00:00 2001 From: ccowman Date: Wed, 7 Aug 2024 13:36:51 +0100 Subject: [PATCH] ci: test test Signed-off-by: ccowman --- .packit.yaml | 12 +++++++++++- contrib/rpm/host-metering.spec.in | 6 +----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.packit.yaml b/.packit.yaml index 8359f26..f83b43f 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -29,4 +29,14 @@ actions: jobs: - job: copr_build trigger: pull_request - targets: [fedora-stable, epel-7-x86_64, rhel-8-x86_64, rhel-9-x86_64] + targets: + fedora-stable: {} + epel-7-x86_64: + additional_repos: + - "https://vault.centos.org/7.9.2009/os/x86_64/" + - "https://vault.centos.org/7.9.2009/updates/x86_64/" + - "https://vault.centos.org/7.9.2009/extras/x86_64/" + - "https://vault.centos.org/centos/7/sclo/x86_64/sclo/" + - "https://vault.centos.org/7.9.2009/sclo/x86_64/rh/" + rhel-8-x86_64: {} + rhel-9-x86_64: {} diff --git a/contrib/rpm/host-metering.spec.in b/contrib/rpm/host-metering.spec.in index 06de450..1c00d37 100644 --- a/contrib/rpm/host-metering.spec.in +++ b/contrib/rpm/host-metering.spec.in @@ -1,10 +1,6 @@ %bcond_without check -%if 0%{?rhel} <= 7 && ! 0%{?fedora} && ! 0%{?centos} -%define gobuild(o:) scl enable go-toolset-1.19 -- go build -mod vendor -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${GO_LDFLAGS:-} ${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '-Wl,-z,relro -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld'" -a -v %{?**}; -%endif %if 0%{?rhel} <= 7 && ! 0%{?fedora} && 0%{?centos} - %define gobuild(o:) go build -mod vendor -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${GO_LDFLAGS:-} ${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '-Wl,-z,relro -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld'" -a -v %{?**}; %endif @@ -31,7 +27,7 @@ URL: https://github.com/RedHatInsights/host-metering/ Source: %{name}-%{version}.tar.gz %if 0%{?rhel} <= 7 && ! 0%{?fedora} && ! 0%{?centos} -BuildRequires: go-toolset-1.19 +BuildRequires: golang >= 1.19 %else BuildRequires: golang >= 1.19 BuildRequires: systemd-rpm-macros