ci: fix ldap install location and add renovate rule for openldap

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 6d389d44b8eb7ffa8720ca1e5157d33f4401efe6..9c57b4c1252303503214d661fa70bd92069d14fd 100644 (file)
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -59,6 +59,7 @@ env:
   QUICTLS_VERSION: 3.3.0
   # renovate: datasource=github-tags depName=rustls/rustls-ffi versioning=semver registryUrl=https://github.com
   RUSTLS_VERSION: 0.15.0
+  # handled in renovate.json
   OPENLDAP_VERSION: 2.6.10
 
 jobs:
@@ -297,7 +298,7 @@ jobs:
           - name: 'openldap-static'
             install_steps: openldap-static
             install_packages: libssl-dev
-            configure: --disable-shared --with-openssl --enable-static --with-ldap=/home/runner/openldap --with-ldap-lib=ldap --with-lber-lib=lber
+            configure: --disable-shared --with-openssl --enable-static --with-ldap=/home/runner/openldap-static --with-ldap-lib=ldap --with-lber-lib=lber
 
     steps:
       - name: 'install prereqs'
@@ -461,7 +462,7 @@ jobs:
           curl --disable --fail --silent --show-error --connect-timeout 15 --max-time 120 --retry 6 --retry-connrefused \
             --location "https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-${OPENLDAP_VERSION}.tgz" | tar -xz
           cd "openldap-${OPENLDAP_VERSION}"
-          ./configure --enable-static --disable-shared --prefix=/home/runner/openldap
+          ./configure --enable-static --disable-shared --prefix=/home/runner/openldap-static
           make
           make install
 

diff --git a/renovate.json b/renovate.json
index c1bdf731cb9dc04df75d8ec4f3d1f318fd247889..efb9064dabf237218280327b048c1539e5c567af 100644 (file)
--- a/renovate.json
+++ b/renovate.json
@@ -95,6 +95,19 @@
       "depNameTemplate": "quictls/openssl",
       "versioningTemplate": "semver",
       "extractVersionTemplate": "^openssl-(?<version>.*)-quic1$"
+    },
+    {
+      "customType": "regex",
+      "managerFilePatterns": [
+        "/^.github/workflows/linux.yml$/"
+      ],
+      "matchStrings": [
+        "OPENLDAP_VERSION: (?<currentValue>.*)\\s"
+      ],
+      "datasourceTemplate": "github-tags",
+      "depNameTemplate": "openldap/openldap",
+      "versioningTemplate": "semver",
+      "extractVersionTemplate": "^OPENLDAP_REL_ENG_(?<major>\\d+)_(?<minor>\\d+)_(?<patch>\\d+)$"
     }
   ]
 }