Clean up MSRV workflow

foresterre · Nov 10, 2024 · 24b9368 · 24b9368
1 parent 51fe57a
commit 24b9368
Showing 1 changed file with 7 additions and 35 deletions.
diff --git a/.github/workflows/msrv.yml b/.github/workflows/msrv.yml
@@ -16,16 +16,16 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        build: [ ubuntu, macos, windows ]
+        build: [ ubuntu, macos ] # [, windows] ... Disabled Windows for now, see #1036
         include:
           - build: ubuntu
             os: ubuntu-latest
 
           - build: macos
             os: macos-latest
 
-          - build: windows
-            os: windows-latest
+    #          - build: windows
+    #            os: windows-latest
     continue-on-error: true
     steps:
       - name: checkout_repo
@@ -35,46 +35,18 @@ jobs:
       - name: install_cargo_msrv
         if: matrix.build == 'ubuntu'
         run: cargo install cargo-msrv
-        shell: bash
       - name: install_cargo_msrv_no_default
         if: matrix.build != 'ubuntu'
         run: cargo install cargo-msrv --no-default-features
-        shell: bash
       - name: version_of_cargo_msrv
         run: cargo msrv --version
-        shell: bash
       - name: run_cargo_msrv
-        run: cargo msrv --output-format json verify
-        shell: bash
+        run: cargo msrv verify --output-format json
       - name: run_cargo_msrv_on_verify_failure
         if: ${{ failure() }}
-        run: cargo msrv --output-format json verify
-        shell: bash
-      - name: debug_run_cargo_msrv_verify
-        if: ${{ failure() }}
-        run: cargo msrv verify --log-target stdout --log-level debug --no-user-output
-        shell: bash
-      - name: debug_manual_install
-        if: ${{ failure() }}
-        run: rustup install --profile minimal 1.78.0
-        shell: bash
-
-  msrv_windows_debug:
-    runs-on: windows-latest
-    continue-on-error: true
-    steps:
-      - name: checkout_repo
-        uses: actions/checkout@v4
-      - name: install_rust
-        uses: dtolnay/rust-toolchain@stable
-      - name: debug_manual_install
-        run: rustup install --no-self-update --profile minimal 1.78.0
-      - name: debug_manual_install_two
-        run: rustup install --no-self-update --profile minimal 1.78.0
-
+        run: cargo msrv find --output-format json
 
   # The same as the 'msrv' job, except it takes the latest release, including beta releases
-  # We don't use --all-features here!
   msrv_pre_release:
     name: msrv_pre_release
     runs-on: ubuntu-latest
@@ -92,7 +64,7 @@ jobs:
       - name: version_of_cargo_msrv
         run: cargo msrv --version
       - name: run_cargo_msrv
-        run: cargo msrv --output-format json verify
+        run: cargo msrv verify --output-format json
       - name: run_cargo_msrv_on_verify_failure
         if: ${{ failure() }}
         run: cargo msrv find --output-format json
@@ -113,7 +85,7 @@ jobs:
       - name: version_of_cargo_msrv
         run: cargo msrv --version
       - name: run_cargo_msrv
-        run: cargo msrv --output-format json verify
+        run: cargo msrv verify --output-format json
       - name: run_cargo_msrv_on_verify_failure
         if: ${{ failure() }}
         run: cargo msrv find --output-format json