Workflow improvements 2 (#2998)

microsoft · Apr 16, 2024 · a666eec · a666eec
1 parent 95dd4de
commit a666eec
Show file tree

Hide file tree

Showing 15 changed files with 318 additions and 194 deletions.
diff --git a/.github/workflows/clippy.yml b/.github/workflows/clippy.yml
diff --git a/.github/workflows/cross.yml b/.github/workflows/cross.yml
@@ -13,8 +13,7 @@ env:
   LLVM-MINGW-TOOLCHAIN-NAME: llvm-mingw-20220906-ucrt-ubuntu-18.04-x86_64
 
 jobs:
-  test:
-    name: Test
+  check:
     strategy:
       matrix:
         #

diff --git a/.github/workflows/debugger_visualizer.yml b/.github/workflows/debugger_visualizer.yml
@@ -12,8 +12,7 @@ env:
   RUSTFLAGS: -Dwarnings --cfg windows_debugger_visualizer
 
 jobs:
-  test:
-    name: Test
+  check:
     runs-on: windows-2019
 
     strategy:

diff --git a/.github/workflows/fmt.yml b/.github/workflows/fmt.yml
@@ -12,8 +12,7 @@ env:
   RUSTFLAGS: -Dwarnings
 
 jobs:
-  fmt:
-    name: Check
+  check:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout

diff --git a/.github/workflows/gen.yml b/.github/workflows/gen.yml
@@ -12,7 +12,7 @@ env:
   RUSTFLAGS: -Dwarnings
 
 jobs:
-  generation:
+  check:
     name: tool_${{ matrix.tool }}
     runs-on: ubuntu-latest
     strategy:

diff --git a/.github/workflows/lib.yml b/.github/workflows/lib.yml
@@ -12,8 +12,7 @@ env:
   RUSTFLAGS: -Dwarnings
 
 jobs:
-  lib_generation:
-    name: Check
+  check:
     runs-on: windows-2019
     steps:
       - name: Checkout

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -12,8 +12,7 @@ env:
   RUSTFLAGS: -Dwarnings
 
 jobs:
-  cargo_windows:
-    name: Check
+  check:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout

diff --git a/.github/workflows/raw_dylib.yml b/.github/workflows/raw_dylib.yml
@@ -12,8 +12,7 @@ env:
   RUSTFLAGS: -Dwarnings --cfg windows_raw_dylib
 
 jobs:
-  test:
-    name: Test
+  check:
     runs-on: windows-2019
 
     strategy:

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -12,8 +12,7 @@ env:
   RUSTFLAGS: -Dwarnings
 
 jobs:
-  test:
-    name: Test
+  check:
     runs-on: windows-2019
 
     strategy:

diff --git a/.github/workflows/windows-bindgen.yml b/.github/workflows/windows-bindgen.yml
@@ -12,8 +12,7 @@ env:
   RUSTFLAGS: -Dwarnings
 
 jobs:
-  cargo_sys:
-    name: Check
+  check:
     strategy:
       matrix:
         rust: [1.70.0, stable, nightly]

diff --git a/.github/workflows/windows-metadata.yml b/.github/workflows/windows-metadata.yml
@@ -12,8 +12,7 @@ env:
   RUSTFLAGS: -Dwarnings
 
 jobs:
-  cargo_sys:
-    name: Check
+  check:
     strategy:
       matrix:
         rust: [1.70.0, stable, nightly]

diff --git a/.github/workflows/windows-sys.yml b/.github/workflows/windows-sys.yml
@@ -12,8 +12,7 @@ env:
   RUSTFLAGS: -Dwarnings
 
 jobs:
-  cargo_sys:
-    name: Check
+  check:
     strategy:
       matrix:
         rust: [1.60.0, stable, nightly]

diff --git a/.github/workflows/windows-version.yml b/.github/workflows/windows-version.yml
@@ -12,8 +12,7 @@ env:
   RUSTFLAGS: -Dwarnings
 
 jobs:
-  cargo_sys:
-    name: Check
+  check:
     strategy:
       matrix:
         rust: [1.60.0, stable, nightly]

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -12,8 +12,7 @@ env:
   RUSTFLAGS: -Dwarnings
 
 jobs:
-  cargo_windows:
-    name: Check
+  check:
     strategy:
       matrix:
         rust: [1.62.0, stable, nightly]

diff --git a/crates/tools/yml/src/main.rs b/crates/tools/yml/src/main.rs
@@ -20,8 +20,7 @@ env:
   RUSTFLAGS: -Dwarnings
 
 jobs:
-  test:
-    name: Test
+  check:
     runs-on: windows-2019
 
     strategy:
@@ -88,7 +87,7 @@ jobs:
 }
 
 fn clippy_yml() {
-    let mut yml = r#"name: clippy
+    let mut yml = r"name: clippy
 
 on:
   pull_request:
@@ -102,34 +101,39 @@ env:
   RUSTFLAGS: -Dwarnings
 
 jobs:
-  cargo_clippy:
-    name: Check
+  check:
     runs-on: windows-2019
+
+    strategy:
+      matrix:
+        include:
+          - version: nightly
+            target: x86_64-pc-windows-msvc
+
     steps:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Update toolchain
-        run: rustup update --no-self-update nightly && rustup default nightly-x86_64-pc-windows-msvc
+        run: rustup update --no-self-update ${{ matrix.version }} && rustup default ${{ matrix.version }}-${{ matrix.target }}
+      - name: Add toolchain target
+        run: rustup target add ${{ matrix.target }}
       - name: Install clippy
         run: rustup component add clippy
-      - name: Configure environment
-        shell: pwsh
-        run: |
-          "C:\Program Files (x86)\Windows Kits\10\bin\10.0.22000.0\x64" >> $env:GITHUB_PATH
-          ((Resolve-Path "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Tools\MSVC\*\bin\Hostx64\x64")
-            | Sort-Object -Descending | Select -First 1).ToString() >> $env:GITHUB_PATH
-          (Join-Path $env:GITHUB_WORKSPACE "target\debug\deps").ToString() >> $env:GITHUB_PATH
-          (Join-Path $env:GITHUB_WORKSPACE "target\test\debug\deps").ToString() >> $env:GITHUB_PATH
-          "INCLUDE=C:\Program Files (x86)\Windows Kits\10\include\10.0.22000.0\winrt;C:\Program Files (x86)\Windows Kits\10\include\10.0.22000.0\cppwinrt" `
-            >> $env:GITHUB_ENV
-      - name: Run cargo clippy
-        run: |"#
+      - name: Fix environment
+        uses: ./.github/actions/fix-environment"
         .to_string();
 
+    // This unrolling is required since "cargo clippy --all" consumes too much memory for the GitHub hosted runners.
+
     for (name, _) in lib::crates("crates") {
-        write!(&mut yml, "\n          cargo clippy -p {name} &&").unwrap();
+        write!(
+            &mut yml,
+            r"
+      - name: Clippy {name}
+        run:  cargo clippy -p {name}"
+        )
+        .unwrap();
     }
 
-    yml.truncate(yml.len() - 3);
     std::fs::write(".github/workflows/clippy.yml", yml.as_bytes()).unwrap();
 }