From 717c5315a2ca55bd3ca6042b52b3fe47b09c0061 Mon Sep 17 00:00:00 2001
From: Holger Obermaier <40787752+ho-ob@users.noreply.github.com>
Date: Tue, 1 Mar 2022 17:07:19 +0100
Subject: [PATCH] Remove old rpmbuild workflow

---
 .github/workflows/AlmaLinux.yml               |  9 +--
 .../workflows/RedHatUniversalBaseImage.yml    |  6 +-
 .github/workflows/rpmbuild.yml                | 58 -------------------
 3 files changed, 8 insertions(+), 65 deletions(-)
 delete mode 100644 .github/workflows/rpmbuild.yml

diff --git a/.github/workflows/AlmaLinux.yml b/.github/workflows/AlmaLinux.yml
index f014e7e..442ad41 100644
--- a/.github/workflows/AlmaLinux.yml
+++ b/.github/workflows/AlmaLinux.yml
@@ -9,10 +9,11 @@ on: push
 jobs:
 
   #
-  # Build on AlmaLinux 8.5 using golang version 1.16
+  # Build on AlmaLinux 8.5 using go-toolset
   #
   AlmaLinux-RPM-build:
     runs-on: ubuntu-latest
+    # See: https://hub.docker.com/_/almalinux
     container: almalinux:8.5
     steps:
 
@@ -41,12 +42,12 @@ jobs:
     - name: Save RPM as artifact
       uses: actions/upload-artifact@v2
       with:
-        name: cc-metric-collector RPM AlmaLinux 8.5
+        name: cc-metric-collector RPM for AlmaLinux 8.5
         path: ${{ steps.rpmbuild.outputs.RPM }}
     - name: Save SRPM as artifact
       uses: actions/upload-artifact@v2
       with:
-        name: cc-metric-collector SRPM AlmaLinux 8.5
+        name: cc-metric-collector SRPM for AlmaLinux 8.5
         path: ${{ steps.rpmbuild.outputs.SRPM }}
 
     # See: https://github.com/softprops/action-gh-release
@@ -57,4 +58,4 @@ jobs:
         name: cc-metric-collector-${{github.ref_name}}
         files: |
          ${{ steps.rpmbuild.outputs.RPM }}
-         ${{ steps.rpmbuild.outputs.SRPM }}
\ No newline at end of file
+         ${{ steps.rpmbuild.outputs.SRPM }}
diff --git a/.github/workflows/RedHatUniversalBaseImage.yml b/.github/workflows/RedHatUniversalBaseImage.yml
index 26f6f52..cfd8a1f 100644
--- a/.github/workflows/RedHatUniversalBaseImage.yml
+++ b/.github/workflows/RedHatUniversalBaseImage.yml
@@ -9,7 +9,7 @@ on: push
 jobs:
 
   #
-  # Build with UBI 8
+  # Build on UBI 8 using go-toolset
   #
   UBI-8-RPM-build:
     runs-on: ubuntu-latest
@@ -42,12 +42,12 @@ jobs:
     - name: Save RPM as artifact
       uses: actions/upload-artifact@v2
       with:
-        name: cc-metric-collector RPM build for UBI 8
+        name: cc-metric-collector RPM for UBI 8
         path: ${{ steps.rpmbuild.outputs.RPM }}
     - name: Save SRPM as artifact
       uses: actions/upload-artifact@v2
       with:
-        name: cc-metric-collector SRPM build for UBI 8
+        name: cc-metric-collector SRPM for UBI 8
         path: ${{ steps.rpmbuild.outputs.SRPM }}
 
     # See: https://github.com/softprops/action-gh-release
diff --git a/.github/workflows/rpmbuild.yml b/.github/workflows/rpmbuild.yml
deleted file mode 100644
index 9c6ae13..0000000
--- a/.github/workflows/rpmbuild.yml
+++ /dev/null
@@ -1,58 +0,0 @@
-name: Run RPM Build
-on:
- push:
-  tags:
-  - '**'
-
-jobs:
-  build-alma-8_5:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - uses: TomTheBear/rpmbuild@alma8.5
-      id: rpm
-      name: Build RPM package on AlmaLinux 8.5
-      with:
-        spec_file: "./scripts/cc-metric-collector.spec"
-    - name: Save RPM as artifact
-      uses: actions/upload-artifact@v1.0.0
-      with:
-        name: cc-metric-collector RPM AlmaLinux 8.5
-        path: ${{ steps.rpm.outputs.rpm_path }}
-    - name: Save SRPM as artifact
-      uses: actions/upload-artifact@v1.0.0
-      with:
-        name: cc-metric-collector SRPM AlmaLinux 8.5
-        path: ${{ steps.rpm.outputs.source_rpm_path }}
-    - name: Release
-      uses: softprops/action-gh-release@v1
-      with:
-        name: cc-metric-collector-${{github.ref_name}}
-        files: |
-         ${{ steps.rpm.outputs.source_rpm_path }}
-         ${{ steps.rpm.outputs.rpm_path }}
-  build-rhel-ubi8:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - uses: TomTheBear/rpmbuild@rh-ubi8
-      id: rpm
-      name: Build RPM package on Red Hat Universal Base Image 8
-      with:
-        spec_file: "./scripts/cc-metric-collector.spec"
-    - name: Save RPM as artifact
-      uses: actions/upload-artifact@v1.0.0
-      with:
-        name: cc-metric-collector RPM Red Hat Universal Base Image 8
-        path: ${{ steps.rpm.outputs.rpm_path }}
-    - name: Save SRPM as artifact
-      uses: actions/upload-artifact@v1.0.0
-      with:
-        name: cc-metric-collector SRPM Red Hat Universal Base Image 8
-        path: ${{ steps.rpm.outputs.source_rpm_path }}
-    - name: Release
-      uses: softprops/action-gh-release@v1
-      with:
-        files: |
-         ${{ steps.rpm.outputs.source_rpm_path }}
-         ${{ steps.rpm.outputs.rpm_path }}