Merge pull request #55 from lbr38/devel

Moving CI to RockyLinux as CentOS7 is deprecated
lbr38 · Jul 3, 2024 · 17118bd · 17118bd
2 parents 151064d + f011ab2
commit 17118bd
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 37 deletions.
diff --git a/.github/workflows/build-rpm.yml b/.github/workflows/build-rpm.yml
@@ -12,7 +12,7 @@ jobs:
     name: Build rpm package
     runs-on: ubuntu-latest
     container:
-      image: centos:7
+      image: rockylinux:9.3
       options: --user root
     steps:
       - name: Checkout
@@ -21,14 +21,10 @@ jobs:
       - name: Get linupdate version
         run: echo "VERSION=$(cat ${GITHUB_WORKSPACE}/version)" >> $GITHUB_ENV
 
-      - name: Install CentOS7 archive repositories
-        run: |
-          rm -f /etc/yum.repos.d/*.repo
-          cp ${GITHUB_WORKSPACE}/.github/workflows/packaging/rpm/centos-archive-repos/*.repo /etc/yum.repos.d/
-          yum clean all          
-
       - name: Install dependencies packages
-        run: yum install rpmdevtools rpmlint -y
+        run: |
+          yum update -y
+          yum install rpmdevtools rpmlint -y
 
       - name: Create build environment
         run: |

diff --git a/.github/workflows/packaging/rpm/centos-archive-repos/extras.repo b/.github/workflows/packaging/rpm/centos-archive-repos/extras.repo
diff --git a/.github/workflows/packaging/rpm/centos-archive-repos/os.repo b/.github/workflows/packaging/rpm/centos-archive-repos/os.repo
diff --git a/.github/workflows/packaging/rpm/centos-archive-repos/updates.repo b/.github/workflows/packaging/rpm/centos-archive-repos/updates.repo
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -70,7 +70,7 @@ jobs:
     name: Build rpm package
     runs-on: ubuntu-latest
     container:
-      image: centos:7
+      image: rockylinux:9.3
       options: --user root
     steps:
       - name: Checkout
@@ -79,14 +79,10 @@ jobs:
       - name: Get linupdate version
         run: echo "VERSION=$(cat ${GITHUB_WORKSPACE}/version)" >> $GITHUB_ENV
 
-      - name: Install CentOS7 archive repositories
-        run: |
-          rm -f /etc/yum.repos.d/*.repo
-          cp ${GITHUB_WORKSPACE}/.github/workflows/packaging/rpm/centos-archive-repos/*.repo /etc/yum.repos.d/
-          yum clean all      
-
       - name: Install dependencies packages
-        run: yum install rpmdevtools rpmlint -y
+        run: |
+          yum update -y
+          yum install rpmdevtools rpmlint -y
 
       - name: Create build environment
         run: |