From bcc15d6b11bc0ac6520f608e5087b09fc2525089 Mon Sep 17 00:00:00 2001 From: Jake O'Shannessy Date: Thu, 26 Dec 2024 19:33:07 +0000 Subject: [PATCH] use GH conditionals --- .github/workflows/smv.yml | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/.github/workflows/smv.yml b/.github/workflows/smv.yml index 519d532..bda0ca4 100644 --- a/.github/workflows/smv.yml +++ b/.github/workflows/smv.yml @@ -19,27 +19,25 @@ jobs: - name: Install basic build prerequisites run: dnf install -y git gcc g++ rpmdevtools make - name: Enable EPEL + if: matrix.container == 'rockylinux:9' run: | - if [ "${{ matrix.container }}" = "rockylinux:9" ] - then + dnf config-manager --set-enabled crb dnf install -y epel-release - fi - name: Install lib prerequisites run: dnf install -y cmake gd-devel freeglut-devel bash gd freeglut libXmu-devel glew-devel libXi-devel libX11-devel - name: Install json-c-devel - run: | - if [ "${{ matrix.container }}" = "rockylinux:9" ] - then - dnf install --enablerepo=devel -y json-c-devel - else - dnf install -y json-c-devel - fi + if: matrix.container == 'rockylinux:9' + run: dnf install --enablerepo=devel -y json-c-devel + - name: Install json-c-devel + if: matrix.container != 'rockylinux:9' + run: dnf install -y json-c-devel - name: Build RPM run: | cd smv bash ./buildrpm.sh + ls dist/*.rpm - uses: actions/upload-artifact@v4 with: name: SMV-RPMs