From 33d954f767c58f23c518def9290491eddd2a6110 Mon Sep 17 00:00:00 2001 From: Holger Obermaier <40787752+ho-ob@users.noreply.github.com> Date: Tue, 1 Mar 2022 17:15:20 +0100 Subject: [PATCH] Action red hat universal base image (#52) Add Red Hat Universal Base Image 8 Workflow --- .github/workflows/AlmaLinux.yml | 9 +-- .../workflows/RedHatUniversalBaseImage.yml | 61 +++++++++++++++++++ .github/workflows/rpmbuild.yml | 58 ------------------ 3 files changed, 66 insertions(+), 62 deletions(-) create mode 100644 .github/workflows/RedHatUniversalBaseImage.yml 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 new file mode 100644 index 0000000..cfd8a1f --- /dev/null +++ b/.github/workflows/RedHatUniversalBaseImage.yml @@ -0,0 +1,61 @@ +# See: https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions + +# Workflow name +name: Red Hat Universal Base Image 8 RPM build + +# Run on event push +on: push + +jobs: + + # + # Build on UBI 8 using go-toolset + # + UBI-8-RPM-build: + runs-on: ubuntu-latest + # See: https://catalog.redhat.com/software/containers/ubi8/ubi/5c359854d70cc534b3a3784e?container-tabs=gti + container: registry.access.redhat.com/ubi8/ubi:8.5-226.1645809065 + steps: + + # Use dnf to install development packages + - name: Install development packages + run: dnf --assumeyes --disableplugin=subscription-manager install rpm-build go-srpm-macros rpm-build-libs rpm-libs gcc make python38 git + + # Checkout git repository and submodules + # fetch-depth must be 0 to use git describe + # See: https://github.com/marketplace/actions/checkout + - name: Checkout + uses: actions/checkout@v2 + with: + submodules: recursive + fetch-depth: 0 + + # Use dnf to install build dependencies + - name: Install build dependencies + run: dnf --assumeyes --disableplugin=subscription-manager builddep scripts/cc-metric-collector.spec + + - name: RPM build MetricCollector + id: rpmbuild + run: make RPM + + # See: https://github.com/actions/upload-artifact + - name: Save RPM as artifact + uses: actions/upload-artifact@v2 + with: + 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 for UBI 8 + path: ${{ steps.rpmbuild.outputs.SRPM }} + + # See: https://github.com/softprops/action-gh-release + - name: Release + uses: softprops/action-gh-release@v1 + if: startsWith(github.ref, 'refs/tags/') + with: + name: cc-metric-collector-${{github.ref_name}} + files: | + ${{ steps.rpmbuild.outputs.RPM }} + ${{ steps.rpmbuild.outputs.SRPM }} 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 }}