Add some basic versioning for some workflows to check whether this is detected properly

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0499f90aa70697b3c5051646f6bfc7261a041ee6..99667b45e71371ef82636cc81ac6b364dc26d24d 100644 (file)
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -175,7 +175,8 @@ commands:
     steps:
       - run:
           command: |
-            WOLFSSL_VER=5.6.0
+            source .github/scripts/VERSIONS
+            echo "Installing wolfSSL $WOLFSSL_VER"
             curl -LOsSf --retry 6 --retry-connrefused --max-time 999 https://github.com/wolfSSL/wolfssl/archive/v$WOLFSSL_VER-stable.tar.gz
             tar -xzf v$WOLFSSL_VER-stable.tar.gz
             cd wolfssl-$WOLFSSL_VER-stable
@@ -187,7 +188,8 @@ commands:
     steps:
       - run:
           command: |
-            WOLFSSH_VER=1.4.12
+            source .github/scripts/VERSIONS
+            echo "Installing wolfSSH $WOLFSSH_VER"
             curl -LOsSf --retry 6 --retry-connrefused --max-time 999 https://github.com/wolfSSL/wolfssh/archive/v$WOLFSSH_VER-stable.tar.gz
             tar -xzf v$WOLFSSH_VER-stable.tar.gz
             cd wolfssh-$WOLFSSH_VER-stable

diff --git a/.github/scripts/VERSIONS b/.github/scripts/VERSIONS
new file mode 100644 (file)
index 0000000..8bbe6aa
--- /dev/null
+++ b/.github/scripts/VERSIONS
@@ -0,0 +1,9 @@
+# Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
+#
+# SPDX-License-Identifier: curl
+
+# renovate: datasource=github-tags depName=wolfSSL/wolfssl versioning=semver registryUrl=https://github.com
+WOLFSSL_VER=5.6.0
+
+# renovate: datasource=github-tags depName=wolfSSL/wolfssh versioning=semver registryUrl=https://github.com
+WOLFSSH_VER=1.4.12

diff --git a/.github/workflows/awslc.yml b/.github/workflows/awslc.yml
index 17514f537a19f6dd97a0d4f1f21e31fc4ead57a7..dec172d77a475832d493587823997f91a6d0e7f5 100644 (file)
--- a/.github/workflows/awslc.yml
+++ b/.github/workflows/awslc.yml
@@ -42,6 +42,8 @@ permissions: {}
 
 env:
   MAKEFLAGS: -j 3
+
+  # renovate: datasource=github-tags depName=awslabs/aws-lc versioning=semver registryUrl=https://github.com
   awslc-version: 1.13.0
 
 jobs:

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 96dbed9acc58928241aa2e7379383a9448529a85..39f9352fcb0cd3c97f760e809b2f16cc92d3d8dc 100644 (file)
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -42,13 +42,20 @@ permissions: {}
 env:
   MAKEFLAGS: -j 3
   bearssl-version: 0.6
-  libressl-version: v3.7.3
-  mbedtls-version: v3.5.0
-  mod_h2-version: v2.0.27
-  msh3-version: v0.6.0
+  # renovate: datasource=github-tags depName=libressl-portable/portable versioning=semver registryUrl=https://github.com
+  libressl-version: 3.7.3
+  # renovate: datasource=github-tags depName=ARMmbed/mbedtls versioning=semver registryUrl=https://github.com
+  mbedtls-version: 3.5.0
+  # renovate: datasource=github-tags depName=icing/mod_h2 versioning=semver registryUrl=https://github.com
+  mod_h2-version: 2.0.27
+  # renovate: datasource=github-tags depName=nibanks/msh3 versioning=semver registryUrl=https://github.com
+  msh3-version: 0.6.0
+  # handled in renovate.json
   openssl3-version: openssl-3.1.3
+  # unhandled
   quictls-version: 3.1.4+quic
-  rustls-version: v0.13.0
+  # renovate: datasource=github-tags depName=rustls/rustls-ffi versioning=semver registryUrl=https://github.com
+  rustls-version: 0.13.0
 
 jobs:
   autotools:
@@ -250,7 +257,7 @@ jobs:
       - name: 'build libressl'
         if: contains(matrix.build.install_steps, 'libressl') && steps.cache-libressl.outputs.cache-hit != 'true'
         run: |
-          git clone --quiet --depth=1 -b ${{ env.libressl-version }} https://github.com/libressl-portable/portable.git libressl-git
+          git clone --quiet --depth=1 -b v${{ env.libressl-version }} https://github.com/libressl-portable/portable.git libressl-git
           cd libressl-git
           ./autogen.sh
           ./configure --prefix=$HOME/libressl
@@ -269,7 +276,7 @@ jobs:
       - name: 'build mbedtls'
         if: contains(matrix.build.install_steps, 'mbedtls') && steps.cache-mbedtls.outputs.cache-hit != 'true'
         run: |
-          git clone --quiet --depth=1 -b ${{ env.mbedtls-version }} https://github.com/ARMmbed/mbedtls
+          git clone --quiet --depth=1 -b v${{ env.mbedtls-version }} https://github.com/ARMmbed/mbedtls
           cd mbedtls
           make DESTDIR=$HOME/mbedtls install
 
@@ -322,7 +329,7 @@ jobs:
       - name: 'build msh3'
         if: contains(matrix.build.install_steps, 'msh3') && steps.cache-msh3.outputs.cache-hit != 'true'
         run: |
-          git clone --quiet -b ${{ env.msh3-version }} --depth=1 --recursive https://github.com/nibanks/msh3
+          git clone --quiet -b v${{ env.msh3-version }} --depth=1 --recursive https://github.com/nibanks/msh3
           cd msh3 && mkdir build && cd build
           cmake -G 'Unix Makefiles' -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=$HOME/msh3 ..
           cmake --build .
@@ -349,7 +356,7 @@ jobs:
       - name: 'build rustls'
         if: contains(matrix.build.install_steps, 'rustls') && steps.cache-rustls.outputs.cache-hit != 'true'
         run: |
-          git clone --quiet --depth=1 -b ${{ env.rustls-version }} --recursive https://github.com/rustls/rustls-ffi.git
+          git clone --quiet --depth=1 -b v${{ env.rustls-version }} --recursive https://github.com/rustls/rustls-ffi.git
           cd rustls-ffi
           make DESTDIR=$HOME/rustls install
 
@@ -392,7 +399,7 @@ jobs:
         if: contains(matrix.build.install_steps, 'pytest') && steps.cache-mod_h2.outputs.cache-hit != 'true'
         run: |
           cd $HOME
-          git clone --quiet --depth=1 -b  ${{ env.mod_h2-version }} https://github.com/icing/mod_h2
+          git clone --quiet --depth=1 -b v${{ env.mod_h2-version }} https://github.com/icing/mod_h2
           cd mod_h2
           autoreconf -fi
           ./configure

diff --git a/renovate.json b/renovate.json
index 5db72dd6a94fc07d18b0e6c0cf76e67ce982f1f9..89a0d18fc24dc2e76389f2c81e071a78d19c54e0 100644 (file)
--- a/renovate.json
+++ b/renovate.json
@@ -1,6 +1,45 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": [
-    "config:recommended"
+    "config:best-practices"
+  ],
+  "customManagers": [
+    {
+      "customType": "regex",
+      "fileMatch": [
+        "^.github/scripts/VERSIONS$"
+      ],
+      "matchStrings": [
+        "# renovate: datasource=(?<datasource>.*?) depName=(?<depName>.*?)( versioning=(?<versioning>.*?))?( extractVersion=(?<extractVersion>.+?))?( registryUrl=(?<registryUrl>.*?))?\\s.*?_VER=(?<currentValue>.*)\\s"
+      ],
+      "versioningTemplate": "{{#if versioning}}{{{versioning}}}{{else}}semver{{/if}}",
+      "extractVersionTemplate": "{{#if extractVersion}}{{{extractVersion}}}{{else}}^v?(?<version>.+)${{/if}}"
+    },
+    {
+      "customType": "regex",
+      "fileMatch": [
+        "^.github/workflows/.*\\.yml$"
+      ],
+      "matchStrings": [
+        "# renovate: datasource=(?<datasource>.*?) depName=(?<depName>.*?)( versioning=(?<versioning>.*?))?( extractVersion=(?<extractVersion>.+?))?( registryUrl=(?<registryUrl>.*?))?\\s.*?-version:\\s*(?<currentValue>.*)\\s"
+      ],
+      "versioningTemplate": "{{#if versioning}}{{{versioning}}}{{else}}semver{{/if}}",
+      "extractVersionTemplate": "{{#if extractVersion}}{{{extractVersion}}}{{else}}^v?(?<version>.+)${{/if}}"
+    },
+    {
+      "customType": "regex",
+      "fileMatch": [
+        "^.github/workflows/linux.yml$",
+        "^.github/workflows/osslq-linux.yml$"
+      ],
+      "matchStrings": [
+        "openssl3-version: (?<currentValue>.*)\\s"
+      ],
+      "datasourceTemplate": "github-tags",
+      "depNameTemplate": "openssl/openssl",
+      "versioningTemplate": "semver",
+      "extractVersionTemplate": "^openssl-(?<major>\\d+)\\.(?<minor>\\d+)\\.(?<patch>\\d+)$",
+      "registryUrlTemplate": "https://github.com"
+    }
   ]
 }

diff --git a/renovate.json.license b/renovate.json.license
new file mode 100644 (file)
index 0000000..d789d4f
--- /dev/null
+++ b/renovate.json.license
@@ -0,0 +1,3 @@
+Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
+
+SPDX-License-Identifier: curl
\ No newline at end of file