Fix issues in CI

microsoft · Feb 16, 2022 · 7384ebb · 7384ebb
1 parent a94f8bb
commit 7384ebb
Show file tree

Hide file tree

Showing 4 changed files with 109 additions and 105 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -70,77 +70,79 @@ jobs:
       run: rustup component add clippy      
     - name: Run cargo clippy
       run: |
+        cargo clippy -p windows-interface &&
+        cargo clippy -p windows-sys &&
         cargo clippy -p windows-bindgen &&
         cargo clippy -p windows-implement &&
-        cargo clippy -p windows-metadata &&
-        cargo clippy -p windows-sys &&
-        cargo clippy -p windows-tokens &&
         cargo clippy -p windows &&
-        cargo clippy -p sample_com_uri &&
-        cargo clippy -p sample_core_app &&
+        cargo clippy -p windows-tokens &&
+        cargo clippy -p windows-metadata &&
+        cargo clippy -p sample_enum_windows &&
         cargo clippy -p sample_create_window &&
-        cargo clippy -p sample_create_window_sys &&
         cargo clippy -p sample_direct2d &&
-        cargo clippy -p sample_direct3d12 &&
-        cargo clippy -p sample_enum_windows &&
-        cargo clippy -p sample_enum_windows_sys &&
-        cargo clippy -p sample_kernel_event &&
-        cargo clippy -p sample_memory_buffer &&
+        cargo clippy -p sample_core_app &&
         cargo clippy -p sample_message_box &&
-        cargo clippy -p sample_ocr &&
-        cargo clippy -p sample_overlapped &&
         cargo clippy -p sample_rss &&
+        cargo clippy -p sample_ocr &&
         cargo clippy -p sample_simple &&
-        cargo clippy -p sample_spellchecker &&
-        cargo clippy -p sample_uiautomation &&
-        cargo clippy -p sample_xaml_app &&
         cargo clippy -p sample_xml &&
-        cargo clippy -p windows_aarch64_msvc &&
+        cargo clippy -p sample_xaml_app &&
+        cargo clippy -p sample_create_window_sys &&
+        cargo clippy -p sample_direct3d12 &&
+        cargo clippy -p sample_uiautomation &&
+        cargo clippy -p sample_com_uri &&
+        cargo clippy -p sample_memory_buffer &&
+        cargo clippy -p sample_overlapped &&
+        cargo clippy -p sample_spellchecker &&
+        cargo clippy -p sample_kernel_event &&
+        cargo clippy -p sample_enum_windows_sys &&
         cargo clippy -p windows_i686_gnu &&
+        cargo clippy -p windows_aarch64_msvc &&
+        cargo clippy -p windows_x86_64_msvc &&
         cargo clippy -p windows_i686_msvc &&
         cargo clippy -p windows_x86_64_gnu &&
-        cargo clippy -p windows_x86_64_msvc &&
-        cargo clippy -p test_agile &&
-        cargo clippy -p test_agile_reference &&
-        cargo clippy -p test_alternate_success_code &&
-        cargo clippy -p test_arch &&
-        cargo clippy -p test_arch_feature &&
-        cargo clippy -p test_bstr &&
+        cargo clippy -p test_implement_vector &&
+        cargo clippy -p test_implement_data_object &&
+        cargo clippy -p test_unions &&
+        cargo clippy -p test_handles &&
+        cargo clippy -p test_matrix3x2 &&
+        cargo clippy -p test_interface &&
+        cargo clippy -p test_does_not_return &&
         cargo clippy -p test_const_fields &&
         cargo clippy -p test_core &&
-        cargo clippy -p test_debug &&
-        cargo clippy -p test_deprecated &&
-        cargo clippy -p test_does_not_return &&
-        cargo clippy -p test_enums &&
-        cargo clippy -p test_handles &&
-        cargo clippy -p test_helpers &&
-        cargo clippy -p test_implement &&
-        cargo clippy -p test_implement_class_factory &&
-        cargo clippy -p test_implement_data_object &&
+        cargo clippy -p test_bstr &&
         cargo clippy -p test_implement_identity &&
-        cargo clippy -p test_implement_map &&
-        cargo clippy -p test_implement_no_use &&
-        cargo clippy -p test_implement_null_result &&
-        cargo clippy -p test_implement_properties &&
-        cargo clippy -p test_implement_vector &&
-        cargo clippy -p test_implement_winrt &&
-        cargo clippy -p test_interop &&
-        cargo clippy -p test_lib &&
-        cargo clippy -p test_matrix3x2 &&
         cargo clippy -p test_mshtml &&
-        cargo clippy -p test_not_dll &&
-        cargo clippy -p test_ntstatus &&
+        cargo clippy -p test_implement_map &&
         cargo clippy -p test_pwstr &&
-        cargo clippy -p test_return_struct &&
-        cargo clippy -p test_structs &&
-        cargo clippy -p test_sys &&
-        cargo clippy -p test_unions &&
+        cargo clippy -p test_alternate_success_code &&
+        cargo clippy -p test_ntstatus &&
+        cargo clippy -p test_interop &&
+        cargo clippy -p test_enums &&
+        cargo clippy -p test_implement_class_factory &&
+        cargo clippy -p test_arch_feature &&
         cargo clippy -p test_weak &&
-        cargo clippy -p test_win32 &&
+        cargo clippy -p test_agile_reference &&
+        cargo clippy -p test_agile &&
+        cargo clippy -p test_sys &&
+        cargo clippy -p test_structs &&
+        cargo clippy -p test_return_struct &&
         cargo clippy -p test_win32_arrays &&
-        cargo clippy -p tool_bindings &&
-        cargo clippy -p tool_gnu &&
+        cargo clippy -p test_arch &&
+        cargo clippy -p test_implement_null_result &&
+        cargo clippy -p test_implement &&
+        cargo clippy -p test_lib &&
+        cargo clippy -p test_implement_winrt &&
+        cargo clippy -p test_implement_no_use &&
+        cargo clippy -p test_implement_properties &&
+        cargo clippy -p test_win32 &&
+        cargo clippy -p test_not_dll &&
+        cargo clippy -p test_helpers &&
+        cargo clippy -p test_debug &&
+        cargo clippy -p test_deprecated &&
         cargo clippy -p tool_msvc &&
+        cargo clippy -p tool_gnu &&
         cargo clippy -p tool_sys &&
-        cargo clippy -p tool_windows &&
-        cargo clippy -p tool_yml 
+        cargo clippy -p tool_yml &&
+        cargo clippy -p tool_bindings &&
+        cargo clippy -p tool_windows 
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -59,84 +59,86 @@ jobs:
       if: contains(matrix.target, 'windows-gnu')
     - name: Test stable
       run: |
-        cargo test --target ${{ matrix.target }} -p windows-bindgen &&
-        cargo test --target ${{ matrix.target }} -p windows-metadata &&
+        cargo test --target ${{ matrix.target }} -p windows-interface &&
         cargo test --target ${{ matrix.target }} -p windows-sys &&
-        cargo test --target ${{ matrix.target }} -p windows-tokens &&
+        cargo test --target ${{ matrix.target }} -p windows-bindgen &&
         cargo test --target ${{ matrix.target }} -p windows &&
-        cargo test --target ${{ matrix.target }} -p windows_aarch64_msvc &&
+        cargo test --target ${{ matrix.target }} -p windows-tokens &&
+        cargo test --target ${{ matrix.target }} -p windows-metadata &&
         cargo test --target ${{ matrix.target }} -p windows_i686_gnu &&
+        cargo test --target ${{ matrix.target }} -p windows_aarch64_msvc &&
+        cargo test --target ${{ matrix.target }} -p windows_x86_64_msvc &&
         cargo test --target ${{ matrix.target }} -p windows_i686_msvc &&
         cargo test --target ${{ matrix.target }} -p windows_x86_64_gnu &&
-        cargo test --target ${{ matrix.target }} -p windows_x86_64_msvc &&
-        cargo test --target ${{ matrix.target }} -p test_agile &&
-        cargo test --target ${{ matrix.target }} -p test_agile_reference &&
-        cargo test --target ${{ matrix.target }} -p test_alternate_success_code &&
-        cargo test --target ${{ matrix.target }} -p test_arch &&
-        cargo test --target ${{ matrix.target }} -p test_arch_feature &&
-        cargo test --target ${{ matrix.target }} -p test_bstr &&
-        cargo test --target ${{ matrix.target }} -p test_const_fields &&
-        cargo test --target ${{ matrix.target }} -p test_core &&
-        cargo test --target ${{ matrix.target }} -p test_debug &&
-        cargo test --target ${{ matrix.target }} -p test_deprecated &&
-        cargo test --target ${{ matrix.target }} -p test_does_not_return &&
-        cargo test --target ${{ matrix.target }} -p test_enums &&
+        cargo test --target ${{ matrix.target }} -p test_unions &&
         cargo test --target ${{ matrix.target }} -p test_handles &&
-        cargo test --target ${{ matrix.target }} -p test_helpers &&
-        cargo test --target ${{ matrix.target }} -p test_interop &&
-        cargo test --target ${{ matrix.target }} -p test_lib &&
         cargo test --target ${{ matrix.target }} -p test_matrix3x2 &&
+        cargo test --target ${{ matrix.target }} -p test_interface &&
+        cargo test --target ${{ matrix.target }} -p test_does_not_return &&
+        cargo test --target ${{ matrix.target }} -p test_const_fields &&
+        cargo test --target ${{ matrix.target }} -p test_core &&
+        cargo test --target ${{ matrix.target }} -p test_bstr &&
         cargo test --target ${{ matrix.target }} -p test_mshtml &&
-        cargo test --target ${{ matrix.target }} -p test_not_dll &&
-        cargo test --target ${{ matrix.target }} -p test_ntstatus &&
         cargo test --target ${{ matrix.target }} -p test_pwstr &&
-        cargo test --target ${{ matrix.target }} -p test_return_struct &&
-        cargo test --target ${{ matrix.target }} -p test_structs &&
-        cargo test --target ${{ matrix.target }} -p test_sys &&
-        cargo test --target ${{ matrix.target }} -p test_unions &&
+        cargo test --target ${{ matrix.target }} -p test_alternate_success_code &&
+        cargo test --target ${{ matrix.target }} -p test_ntstatus &&
+        cargo test --target ${{ matrix.target }} -p test_interop &&
+        cargo test --target ${{ matrix.target }} -p test_enums &&
+        cargo test --target ${{ matrix.target }} -p test_arch_feature &&
         cargo test --target ${{ matrix.target }} -p test_weak &&
-        cargo test --target ${{ matrix.target }} -p test_win32 &&
+        cargo test --target ${{ matrix.target }} -p test_agile_reference &&
+        cargo test --target ${{ matrix.target }} -p test_agile &&
+        cargo test --target ${{ matrix.target }} -p test_sys &&
+        cargo test --target ${{ matrix.target }} -p test_structs &&
+        cargo test --target ${{ matrix.target }} -p test_return_struct &&
         cargo test --target ${{ matrix.target }} -p test_win32_arrays &&
-        cargo test --target ${{ matrix.target }} -p tool_bindings &&
-        cargo test --target ${{ matrix.target }} -p tool_gnu &&
+        cargo test --target ${{ matrix.target }} -p test_arch &&
+        cargo test --target ${{ matrix.target }} -p test_lib &&
+        cargo test --target ${{ matrix.target }} -p test_win32 &&
+        cargo test --target ${{ matrix.target }} -p test_not_dll &&
+        cargo test --target ${{ matrix.target }} -p test_helpers &&
+        cargo test --target ${{ matrix.target }} -p test_debug &&
+        cargo test --target ${{ matrix.target }} -p test_deprecated &&
         cargo test --target ${{ matrix.target }} -p tool_msvc &&
+        cargo test --target ${{ matrix.target }} -p tool_gnu &&
         cargo test --target ${{ matrix.target }} -p tool_sys &&
-        cargo test --target ${{ matrix.target }} -p tool_windows &&
-        cargo test --target ${{ matrix.target }} -p tool_yml 
+        cargo test --target ${{ matrix.target }} -p tool_yml &&
+        cargo test --target ${{ matrix.target }} -p tool_bindings &&
+        cargo test --target ${{ matrix.target }} -p tool_windows 
       if: matrix.version == 'stable'
 
     - name: Test nightly
       run: |
         cargo test --target ${{ matrix.target }} -p windows-implement &&
-        cargo test --target ${{ matrix.target }} -p sample_com_uri &&
-        cargo test --target ${{ matrix.target }} -p sample_core_app &&
+        cargo test --target ${{ matrix.target }} -p sample_enum_windows &&
         cargo test --target ${{ matrix.target }} -p sample_create_window &&
-        cargo test --target ${{ matrix.target }} -p sample_create_window_sys &&
         cargo test --target ${{ matrix.target }} -p sample_direct2d &&
-        cargo test --target ${{ matrix.target }} -p sample_direct3d12 &&
-        cargo test --target ${{ matrix.target }} -p sample_enum_windows &&
-        cargo test --target ${{ matrix.target }} -p sample_enum_windows_sys &&
-        cargo test --target ${{ matrix.target }} -p sample_kernel_event &&
-        cargo test --target ${{ matrix.target }} -p sample_memory_buffer &&
+        cargo test --target ${{ matrix.target }} -p sample_core_app &&
         cargo test --target ${{ matrix.target }} -p sample_message_box &&
-        cargo test --target ${{ matrix.target }} -p sample_ocr &&
-        cargo test --target ${{ matrix.target }} -p sample_overlapped &&
         cargo test --target ${{ matrix.target }} -p sample_rss &&
+        cargo test --target ${{ matrix.target }} -p sample_ocr &&
         cargo test --target ${{ matrix.target }} -p sample_simple &&
-        cargo test --target ${{ matrix.target }} -p sample_spellchecker &&
-        cargo test --target ${{ matrix.target }} -p sample_uiautomation &&
-        cargo test --target ${{ matrix.target }} -p sample_xaml_app &&
         cargo test --target ${{ matrix.target }} -p sample_xml &&
-        cargo test --target ${{ matrix.target }} -p test_implement &&
-        cargo test --target ${{ matrix.target }} -p test_implement_class_factory &&
+        cargo test --target ${{ matrix.target }} -p sample_xaml_app &&
+        cargo test --target ${{ matrix.target }} -p sample_create_window_sys &&
+        cargo test --target ${{ matrix.target }} -p sample_direct3d12 &&
+        cargo test --target ${{ matrix.target }} -p sample_uiautomation &&
+        cargo test --target ${{ matrix.target }} -p sample_com_uri &&
+        cargo test --target ${{ matrix.target }} -p sample_memory_buffer &&
+        cargo test --target ${{ matrix.target }} -p sample_overlapped &&
+        cargo test --target ${{ matrix.target }} -p sample_spellchecker &&
+        cargo test --target ${{ matrix.target }} -p sample_kernel_event &&
+        cargo test --target ${{ matrix.target }} -p sample_enum_windows_sys &&
+        cargo test --target ${{ matrix.target }} -p test_implement_vector &&
         cargo test --target ${{ matrix.target }} -p test_implement_data_object &&
         cargo test --target ${{ matrix.target }} -p test_implement_identity &&
         cargo test --target ${{ matrix.target }} -p test_implement_map &&
-        cargo test --target ${{ matrix.target }} -p test_implement_no_use &&
+        cargo test --target ${{ matrix.target }} -p test_implement_class_factory &&
         cargo test --target ${{ matrix.target }} -p test_implement_null_result &&
-        cargo test --target ${{ matrix.target }} -p test_implement_properties &&
-        cargo test --target ${{ matrix.target }} -p test_implement_vector &&
-        cargo test --target ${{ matrix.target }} -p test_implement_winrt 
+        cargo test --target ${{ matrix.target }} -p test_implement &&
+        cargo test --target ${{ matrix.target }} -p test_implement_winrt &&
+        cargo test --target ${{ matrix.target }} -p test_implement_no_use &&
+        cargo test --target ${{ matrix.target }} -p test_implement_properties 
       if: matrix.version == 'nightly'
 
     - name: Check import libs

diff --git a/crates/libs/interface/Cargo.toml b/crates/libs/interface/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "windows-interface"
 version = "0.32.0"
-edition = "2021"
+edition = "2018"
 authors = ["Microsoft"]
 license = "MIT OR Apache-2.0"
 description = "The interface macro for the windows crate"

diff --git a/crates/tests/interface/Cargo.toml b/crates/tests/interface/Cargo.toml
@@ -2,7 +2,7 @@
 name = "test_interface"
 version = "0.0.0"
 authors = ["Microsoft"]
-edition = "2021"
+edition = "2018"
 
 [dependencies.windows]
 path = "../../libs/windows"