From 14355b94421716dd2a70b7bfe1d863f80c768be8 Mon Sep 17 00:00:00 2001
From: Rob Ede <robjtede@icloud.com>
Date: Sat, 26 Aug 2023 18:19:32 +0100
Subject: [PATCH] ci: name msrv jobs (#3114)

---
 .github/workflows/ci-post-merge.yml |  8 ++++----
 .github/workflows/ci.yml            | 17 +++++++++--------
 .gitignore                          |  1 +
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/ci-post-merge.yml b/.github/workflows/ci-post-merge.yml
index 06669e31e62..5460eeec4fc 100644
--- a/.github/workflows/ci-post-merge.yml
+++ b/.github/workflows/ci-post-merge.yml
@@ -22,9 +22,9 @@ jobs:
           - { name: macOS, os: macos-latest, triple: x86_64-apple-darwin }
           - { name: Windows, os: windows-latest, triple: x86_64-pc-windows-msvc }
         version:
-          - nightly
+          - { name: nightly, version: nightly }
 
-    name: ${{ matrix.target.name }} / ${{ matrix.version }}
+    name: ${{ matrix.target.name }} / ${{ matrix.version.name }}
     runs-on: ${{ matrix.target.os }}
 
     steps:
@@ -39,10 +39,10 @@ jobs:
           echo 'OPENSSL_DIR=C:\Program Files\OpenSSL-Win64' | Out-File -FilePath $env:GITHUB_ENV -Append
           echo 'OPENSSL_DIR=C:\Program Files\OpenSSL' | Out-File -FilePath $env:GITHUB_ENV -Append
 
-      - name: Install Rust (${{ matrix.version }})
+      - name: Install Rust (${{ matrix.version.name }})
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: ${{ matrix.version }}
+          toolchain: ${{ matrix.version.version }}
 
       - name: Install cargo-hack
         uses: taiki-e/install-action@cargo-hack
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f073f6afe15..f1220201735 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -26,10 +26,10 @@ jobs:
           - { name: macOS, os: macos-latest, triple: x86_64-apple-darwin }
           - { name: Windows, os: windows-latest, triple: x86_64-pc-windows-msvc }
         version:
-          - 1.68.0 # MSRV
-          - stable
+          - { name: msrv, version: 1.68.0 }
+          - { name: stable, version: stable }
 
-    name: ${{ matrix.target.name }} / ${{ matrix.version }}
+    name: ${{ matrix.target.name }} / ${{ matrix.version.name }}
     runs-on: ${{ matrix.target.os }}
 
     steps:
@@ -44,17 +44,18 @@ jobs:
           echo 'OPENSSL_DIR=C:\Program Files\OpenSSL-Win64' | Out-File -FilePath $env:GITHUB_ENV -Append
           echo 'OPENSSL_DIR=C:\Program Files\OpenSSL' | Out-File -FilePath $env:GITHUB_ENV -Append
 
-      - name: Install Rust (${{ matrix.version }})
+      - name: Install Rust (${{ matrix.version.name }})
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: ${{ matrix.version }}
+          toolchain: ${{ matrix.version.version }}
 
       - name: Install cargo-hack
         uses: taiki-e/install-action@cargo-hack
 
-      # - name: workaround MSRV issues
-      #   if: matrix.version != 'stable'
-      #   run: |
+      - name: workaround MSRV issues
+        if: matrix.version.name != 'stable'
+        run: |
+          cargo update -p=clap --precise=4.3.24
 
       - name: check minimal
         run: cargo ci-check-min
diff --git a/.gitignore b/.gitignore
index 91930acf85a..48ccccb9253 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,4 +21,5 @@ guide/build/
 .vscode
 
 # code coverage
+/lcov.info
 /codecov.json