ci: name msrv jobs (#3114)

actix · Aug 26, 2023 · 14355b9 · 14355b9
1 parent d8df60b
commit 14355b9
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 12 deletions.
diff --git 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
@@ -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
@@ -21,4 +21,5 @@ guide/build/
 .vscode
 
 # code coverage
+/lcov.info
 /codecov.json