ClusterCockpit/cc-metric-collector
1
0
Fork 0
mirror of https://github.com/ClusterCockpit/cc-metric-collector.git synced 2024-12-27 07:39:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove condition around BuildRequires and use go-toolkit for RPM builds

Browse Source
This commit is contained in:
Thomas Roehl 2024-12-20 18:43:21 +01:00
parent 7ee85a07dc
commit 3d70c8afc9
2 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
.github/workflows/Release.yml vendored
View File

@ -41,10 +41,12 @@ jobs:
submodules: recursive submodules: recursive
fetch-depth: 0 fetch-depth: 0
# - name: Setup Golang
# uses: actions/setup-go@v5
# with:
# go-version: 'stable'
- name: Setup Golang - name: Setup Golang
uses: actions/setup-go@v5 run: dnf --assumeyes --disableplugin=subscription-manager install go-toolkit
with:
go-version: 'stable'
- name: RPM build MetricCollector - name: RPM build MetricCollector
id: rpmbuild id: rpmbuild
@ -110,10 +112,12 @@ jobs:
submodules: recursive submodules: recursive
fetch-depth: 0 fetch-depth: 0
# - name: Setup Golang
# uses: actions/setup-go@v5
# with:
# go-version: 'stable'
- name: Setup Golang - name: Setup Golang
uses: actions/setup-go@v5 run: dnf --assumeyes --disableplugin=subscription-manager install go-toolkit
with:
go-version: 'stable'
- name: RPM build MetricCollector - name: RPM build MetricCollector
id: rpmbuild id: rpmbuild
@ -176,10 +180,12 @@ jobs:
submodules: recursive submodules: recursive
fetch-depth: 0 fetch-depth: 0
# - name: Setup Golang
# uses: actions/setup-go@v5
# with:
# go-version: 'stable'
- name: Setup Golang - name: Setup Golang
uses: actions/setup-go@v5 run: dnf --assumeyes --disableplugin=subscription-manager install go-toolkit
with:
go-version: 'stable'
- name: RPM build MetricCollector - name: RPM build MetricCollector
id: rpmbuild id: rpmbuild
@ -211,7 +217,7 @@ jobs:
# Use dnf to install development packages # Use dnf to install development packages
- name: Install development packages - name: Install development packages
run: dnf --assumeyes --disableplugin=subscription-manager install rpm-build go-srpm-macros gcc make python39 git wget openssl-devel diffutils delve run: dnf --assumeyes --disableplugin=subscription-manager install rpm-build go-srpm-macros gcc make python39 git wget openssl-devel diffutils delve go-toolkit
# Checkout git repository and submodules # Checkout git repository and submodules
# fetch-depth must be 0 to use git describe # fetch-depth must be 0 to use git describe
@ -223,10 +229,12 @@ jobs:
fetch-depth: 0 fetch-depth: 0
# See: https://github.com/marketplace/actions/setup-go-environment # See: https://github.com/marketplace/actions/setup-go-environment
# - name: Setup Golang
# uses: actions/setup-go@v5
# with:
# go-version: 'stable'
- name: Setup Golang - name: Setup Golang
uses: actions/setup-go@v5 run: dnf --assumeyes --disableplugin=subscription-manager install go-toolkit
with:
go-version: 'stable'
- name: RPM build MetricCollector - name: RPM build MetricCollector
id: rpmbuild id: rpmbuild
@ -310,7 +318,7 @@ jobs:
- name: Install development packages - name: Install development packages
run: | run: |
apt update && apt --assume-yes upgrade apt update && apt --assume-yes upgrade
apt --assume-yes install build-essential sed git wget bash apt --assume-yes install build-essential sed git wget bash go
# Checkout git repository and submodules # Checkout git repository and submodules
# fetch-depth must be 0 to use git describe # fetch-depth must be 0 to use git describe
# See: https://github.com/marketplace/actions/checkout # See: https://github.com/marketplace/actions/checkout

2
scripts/cc-metric-collector.spec
View File

@ -6,9 +6,7 @@ Summary: Metric collection daemon from the ClusterCockpit suite
License: MIT License: MIT
Source0: %{name}-%{version}.tar.gz Source0: %{name}-%{version}.tar.gz
%if "%{getenv:CI}" != "1"
BuildRequires: go-toolset BuildRequires: go-toolset
%endif
BuildRequires: systemd-rpm-macros BuildRequires: systemd-rpm-macros
# for header downloads # for header downloads
BuildRequires: wget BuildRequires: wget