WIP add Rocky-9

ralphlange · Dec 25, 2024 · da80240 · da80240
1 parent ba47587
commit da80240
Showing 1 changed file with 9 additions and 25 deletions.
diff --git a/.github/workflows/ci-scripts-build.yml b/.github/workflows/ci-scripts-build.yml
@@ -211,6 +211,12 @@ jobs:
             configuration: default
             extra: "CMD_CXXFLAGS=-std=c++11"
 
+          - name: "Rocky-9"
+            image: rockylinux:9
+            cmp: gcc
+            configuration: default
+            extra: "CMD_CXXFLAGS=-std=c++11"
+
           - name: "Fedora-33"
             image: fedora:33
             cmp: gcc
@@ -225,34 +231,16 @@ jobs:
 
     steps:
     - name: "Fix repo URLs"
-      # centos:8 is past EOL, repos are in the vault
+      # centos:8 is frozen, repos are in the vault
       if: matrix.image=='centos:8'
       run: |
         sed -i -e "s|mirrorlist=|#mirrorlist=|" \
         -e "s|#baseurl=http://mirror|baseurl=http://vault|" \
         /etc/yum.repos.d/CentOS-Linux-{BaseOS,AppStream,Extras,Plus}.repo
-    - name: "Build newer Git"
-      # actions/checkout@v2 wants git >=2.18
-      # centos:7 has 1.8
-      if: matrix.image=='centos:7'
-      run: |
-        yum -y install curl make gcc curl-devel expat-devel gettext-devel openssl-devel zlib-devel perl-ExtUtils-MakeMaker
-        curl https://mirrors.edge.kernel.org/pub/software/scm/git/git-2.29.0.tar.gz | tar -xz
-        cd git-*
-        make -j2 prefix=/usr/local all
-        make prefix=/usr/local install
-        cd ..
-        rm -rf git-*
-        type -a git
-        git --version
     - name: "Redhat setup"
       run: |
-        dnfyum() {
-            dnf -y "$@" || yum -y "$@"
-            return $?
-        }
-        dnfyum install python3 gdb make perl gcc-c++ glibc-devel readline-devel ncurses-devel perl-devel perl-Test-Simple
-        git --version || dnfyum install git
+        yum install python3 gdb make perl gcc-c++ glibc-devel readline-devel ncurses-devel perl-devel perl-Test-Simple
+        git --version || dnf install git
         # rather than just bite the bullet and link python3 -> python,
         # people would rather just break all existing scripts...
         [ -e /usr/bin/python ] || ln -sf python3 /usr/bin/python
@@ -262,10 +250,6 @@ jobs:
         submodules: true
     - name: Automatic core dumper analysis
       uses: mdavidsaver/ci-core-dumper@master
-      if: matrix.image!='centos:7'
-    - name: Automatic core dumper analysis
-      uses: mdavidsaver/ci-core-dumper@node16
-      if: matrix.image=='centos:7'
     - name: Prepare and compile dependencies
       run: python .ci/cue.py prepare
     - name: Build main module