Merge remote-tracking branch 'upstream/main'

r-hub · Jan 10, 2025 · d7f65d5 · d7f65d5
2 parents 454a3af + 665bc93
commit d7f65d5
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 12 deletions.
diff --git a/rules/libgit2.json b/rules/libgit2.json
@@ -85,16 +85,22 @@
       ]
     },
     {
+      "packages": ["libgit2_1.7-devel"],
       "pre_install": [
-        { "command": "dnf install -y dnf-plugins-core" },
-        { "command": "dnf config-manager --set-enabled powertools" }
+        {
+          "command": "dnf install -y epel-release"
+        }
       ],
-      "packages": ["libgit2-devel"],
       "constraints": [
         {
           "os": "linux",
           "distribution": "centos",
           "versions": ["8"]
+        },
+        {
+          "os": "linux",
+          "distribution": "rockylinux",
+          "versions": ["8"]
         }
       ]
     },
@@ -112,12 +118,12 @@
       ]
     },
     {
+      "packages": ["libgit2_1.7-devel"],
       "pre_install": [
         {
-          "command": "subscription-manager repos --enable codeready-builder-for-rhel-8-$(arch)-rpms"
+          "command": "dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm"
         }
       ],
-      "packages": ["libgit2-devel"],
       "constraints": [
         {
           "os": "linux",

diff --git a/rules/netcdf4.json b/rules/netcdf4.json
@@ -41,9 +41,9 @@
     {
       "packages": ["netcdf-devel"],
       "pre_install": [
-        {
-          "command": "dnf install -y epel-release"
-        }
+        { "command": "dnf install -y dnf-plugins-core" },
+        { "command": "dnf config-manager --set-enabled powertools" },
+        { "command": "dnf install -y epel-release" }
       ],
       "constraints": [
         {
@@ -53,7 +53,8 @@
         },
         {
           "os": "linux",
-          "distribution": "rockylinux"
+          "distribution": "rockylinux",
+          "versions": ["8"]
         }
       ]
     },
@@ -112,9 +113,8 @@
     {
       "packages": ["netcdf-devel"],
       "pre_install": [
-        {
-          "command": "dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm"
-        }
+        { "command": "subscription-manager repos --enable codeready-builder-for-rhel-8-$(arch)-rpms" },
+        { "command": "dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm" }
       ],
       "constraints": [
         {