Skip to content

Commit

Permalink
ci: test
Browse files Browse the repository at this point in the history
test

Signed-off-by: ccowman <[email protected]>
  • Loading branch information
ConorC117 committed Aug 7, 2024
1 parent 22e216a commit 9321465
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 6 deletions.
12 changes: 11 additions & 1 deletion .packit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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: {}
6 changes: 1 addition & 5 deletions contrib/rpm/host-metering.spec.in
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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
Expand Down

0 comments on commit 9321465

Please sign in to comment.