From c23a457e72abe608715ac76f076f47dc42af07a5 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Thu, 30 May 2024 20:31:44 +0200
Subject: Merging upstream version 1.74.1+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 src/tools/cargo/.github/renovate.json5     | 27 +++++++++++++++++++++++++++
 src/tools/cargo/.github/workflows/main.yml | 11 ++++++++++-
 2 files changed, 37 insertions(+), 1 deletion(-)

(limited to 'src/tools/cargo/.github')

diff --git a/src/tools/cargo/.github/renovate.json5 b/src/tools/cargo/.github/renovate.json5
index 8ad9952d2..b633fc245 100644
--- a/src/tools/cargo/.github/renovate.json5
+++ b/src/tools/cargo/.github/renovate.json5
@@ -8,7 +8,34 @@
   ignorePaths: [
     "**/tests/**",
   ],
+  customManagers: [
+    {
+      customType: 'regex',
+      fileMatch: [
+        '^Cargo.toml$',
+      ],
+      matchStrings: [
+        'rust-version.*?(?<currentValue>\\d+\\.\\d+(\\.\\d+)?)',
+      ],
+      depNameTemplate: 'latest-msrv',
+      packageNameTemplate: 'rust-lang/rust',
+      datasourceTemplate: 'github-releases',
+    },
+  ],
   packageRules: [
+    {
+      commitMessageTopic: 'Latest MSRV',
+      matchManagers: [
+        'regex',
+      ],
+      matchPackageNames: [
+        'latest-msrv',
+      ],
+      "extractVersion": "^(?<version>\\d+\\.\\d+)",  // Drop the patch version
+      schedule: [
+        '* * * * *',
+      ],
+    },
     // Goals:
     // - Rollup safe upgrades to reduce CI runner load
     // - Have lockfile and manifest in-sync (implicit rules)
diff --git a/src/tools/cargo/.github/workflows/main.yml b/src/tools/cargo/.github/workflows/main.yml
index 2e71f14b8..44dd76e13 100644
--- a/src/tools/cargo/.github/workflows/main.yml
+++ b/src/tools/cargo/.github/workflows/main.yml
@@ -20,6 +20,7 @@ jobs:
     needs:
     - build_std
     - clippy
+    - credential_msrv
     - docs
     - lockfile
     - resolver
@@ -37,6 +38,7 @@ jobs:
     needs:
     - build_std
     - clippy
+    - credential_msrv
     - docs
     - lockfile
     - resolver
@@ -176,7 +178,7 @@ jobs:
       run: 'cargo test -p cargo --test testsuite -- fix::'
       env:
         __CARGO_TEST_FORCE_ARGFILE: 1
-    - run: cargo test --workspace --exclude cargo --exclude benchsuite
+    - run: cargo test --workspace --exclude cargo --exclude benchsuite --exclude resolver-tests
     - name: Check benchmarks
       run: |
         # This only tests one benchmark since it can take over 10 minutes to
@@ -246,3 +248,10 @@ jobs:
         cd target
         curl -sSLO https://raw.githubusercontent.com/rust-lang/rust/master/src/tools/linkchecker/linkcheck.sh
         sh linkcheck.sh --all --path ../src/doc cargo
+
+  credential_msrv:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - run: rustup update 1.70 && rustup default 1.70
+    - run: cargo test -p cargo-credential
-- 
cgit v1.2.3