From 01090f7e104b447f3ba8981a0ee60d4671454881 Mon Sep 17 00:00:00 2001
From: Holger Obermaier <40787752+ho-ob@users.noreply.github.com>
Date: Tue, 1 Mar 2022 14:08:18 +0100
Subject: [PATCH] Use go-toolset from AlmaLinux
---
.github/workflows/AlmaLinux.yml | 6 ------
Makefile | 2 +-
2 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/.github/workflows/AlmaLinux.yml b/.github/workflows/AlmaLinux.yml
index ea60ff2..b1b94c1 100644
--- a/.github/workflows/AlmaLinux.yml
+++ b/.github/workflows/AlmaLinux.yml
@@ -33,12 +33,6 @@ jobs:
- name: Install build dependencies
run: dnf --assumeyes builddep scripts/cc-metric-collector.spec
- # See: https://github.com/marketplace/actions/setup-go-environment
- - name: Setup Golang
- uses: actions/setup-go@v2
- with:
- go-version: '^1.16.7'
-
- name: RPM build MetricCollector
id: rpmbuild
run: |
diff --git a/Makefile b/Makefile
index 654ef1c..e1bae82 100644
--- a/Makefile
+++ b/Makefile
@@ -74,4 +74,4 @@ RPM: scripts/cc-metric-collector.spec
@SRCFILE="$${SOURCEDIR}/$${PREFIX}.$${FORMAT}"
@git archive --verbose --format "$${FORMAT}" --prefix="$${PREFIX}/" --output="$${SRCFILE}" HEAD
# Build RPM and SRPM
- @rpmbuild -ba --define="VERS $${VERS}" --rmsource --clean --nodeps "$${SPECFILE}"
\ No newline at end of file
+ @rpmbuild -ba --define="VERS $${VERS}" --rmsource --clean "$${SPECFILE}"