From f011ab241ad92afedbd091812b3db1019f008400 Mon Sep 17 00:00:00 2001 From: Ludovic <54670129+lbr38@users.noreply.github.com> Date: Wed, 3 Jul 2024 17:56:12 +0200 Subject: [PATCH] Moving CI to RockyLinux as CentOS7 is deprecated --- .github/workflows/build-rpm.yml | 12 ++++-------- .../packaging/rpm/centos-archive-repos/extras.repo | 7 ------- .../packaging/rpm/centos-archive-repos/os.repo | 7 ------- .../packaging/rpm/centos-archive-repos/updates.repo | 7 ------- .github/workflows/release.yml | 12 ++++-------- 5 files changed, 8 insertions(+), 37 deletions(-) delete mode 100644 .github/workflows/packaging/rpm/centos-archive-repos/extras.repo delete mode 100644 .github/workflows/packaging/rpm/centos-archive-repos/os.repo delete mode 100644 .github/workflows/packaging/rpm/centos-archive-repos/updates.repo diff --git a/.github/workflows/build-rpm.yml b/.github/workflows/build-rpm.yml index 0d01d3a..31475cc 100644 --- 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 deleted file mode 100644 index 3f0cf83..0000000 --- a/.github/workflows/packaging/rpm/centos-archive-repos/extras.repo +++ /dev/null @@ -1,7 +0,0 @@ -[extras] -name=extras repo -comment=extras repo -baseurl=https://vault.centos.org/7.9.2009/extras/x86_64/ -enabled=1 -gpgkey=https://vault.centos.org/RPM-GPG-KEY-CentOS-7 -gpgcheck=1 \ No newline at end of file diff --git a/.github/workflows/packaging/rpm/centos-archive-repos/os.repo b/.github/workflows/packaging/rpm/centos-archive-repos/os.repo deleted file mode 100644 index 03101ab..0000000 --- a/.github/workflows/packaging/rpm/centos-archive-repos/os.repo +++ /dev/null @@ -1,7 +0,0 @@ -[os] -name=os repo -comment=os repo -baseurl=https://vault.centos.org/7.9.2009/os/x86_64/ -enabled=1 -gpgkey=https://vault.centos.org/RPM-GPG-KEY-CentOS-7 -gpgcheck=1 \ No newline at end of file diff --git a/.github/workflows/packaging/rpm/centos-archive-repos/updates.repo b/.github/workflows/packaging/rpm/centos-archive-repos/updates.repo deleted file mode 100644 index 677e261..0000000 --- a/.github/workflows/packaging/rpm/centos-archive-repos/updates.repo +++ /dev/null @@ -1,7 +0,0 @@ -[updates] -name=updates repo -comment=updates repo -baseurl=https://vault.centos.org/7.9.2009/updates/x86_64/ -enabled=1 -gpgkey=https://vault.centos.org/RPM-GPG-KEY-CentOS-7 -gpgcheck=1 \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ff11ae4..afd7de4 100644 --- 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: |