Skip to content

Commit 114d846

Browse files
MarijnS95MarijnS95
authored
Cleanup yml formatting and indentation (#1865)
1 parent f6e51fa commit 114d846

File tree

6 files changed

+460
-462
lines changed

6 files changed

+460
-462
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Bug report
22
description: File a bug report
3-
title: 'Bug:'
3+
title: "Bug:"
44
labels: [bug]
55
assignees: []
66
body:

‎.github/ISSUE_TEMPLATE/feature_request.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
name: Feature request
22
description: Suggest an improvement to windows-rs
3-
title: 'Feature request:'
4-
labels: ['enhancement']
3+
title: "Feature request:"
4+
labels: ["enhancement"]
55
assignees: []
66
body:
77
- type: markdown
88
attributes:
99
value: >
10-
Thank you for submitting a feature request!
10+
Thank you for submitting a feature request!
1111
- type: textarea
1212
attributes:
1313
label: Motivation

‎.github/workflows/build.yml

Lines changed: 132 additions & 133 deletions
Original file line numberDiff line numberDiff line change
@@ -10,24 +10,23 @@ env:
1010
RUSTFLAGS: -Dwarnings
1111

1212
jobs:
13-
1413
cargo_fmt:
1514
name: Check cargo formatting
1615
runs-on: windows-2019
1716
steps:
18-
- name: Checkout
19-
uses: actions/checkout@v2
20-
- name: Run cargo fmt
21-
run: cargo fmt --all -- --check
17+
- name: Checkout
18+
uses: actions/checkout@v2
19+
- name: Run cargo fmt
20+
run: cargo fmt --all -- --check
2221

2322
cargo_doc:
2423
name: Check cargo docs
2524
runs-on: windows-2019
2625
steps:
27-
- name: Checkout
28-
uses: actions/checkout@v2
29-
- name: Run cargo doc
30-
run: cargo doc --no-deps -p windows
26+
- name: Checkout
27+
uses: actions/checkout@v2
28+
- name: Run cargo doc
29+
run: cargo doc --no-deps -p windows
3130

3231
generation:
3332
name: Check generation of `tool_${{ matrix.generator }}`
@@ -36,13 +35,13 @@ jobs:
3635
matrix:
3736
generator: [bindings, windows, sys, yml]
3837
steps:
39-
- name: Checkout
40-
uses: actions/checkout@v2
41-
- name: Run tool_${{ matrix.generator }}
42-
run: cargo run -p tool_${{ matrix.generator }}
43-
- name: Compare
44-
shell: bash
45-
run: git diff --exit-code || (echo '::error::Generated `tool_${{ matrix.generator }}` are out-of-date. Please run `cargo run -p tool_${{ matrix.generator }}`'; exit 1)
38+
- name: Checkout
39+
uses: actions/checkout@v2
40+
- name: Run tool_${{ matrix.generator }}
41+
run: cargo run -p tool_${{ matrix.generator }}
42+
- name: Compare
43+
shell: bash
44+
run: git diff --exit-code || (echo '::error::Generated `tool_${{ matrix.generator }}` are out-of-date. Please run `cargo run -p tool_${{ matrix.generator }}`'; exit 1)
4645

4746
cargo_sys:
4847
name: Check windows-sys
@@ -51,12 +50,12 @@ jobs:
5150
matrix:
5251
rust: [1.46.0, stable, nightly]
5352
steps:
54-
- name: Checkout
55-
uses: actions/checkout@v2
56-
- name: Update toolchain
57-
run: rustup update --no-self-update ${{ matrix.rust }} && rustup default ${{ matrix.rust }}
58-
- name: Run cargo check
59-
run: cargo check -p windows-sys --all-features
53+
- name: Checkout
54+
uses: actions/checkout@v2
55+
- name: Update toolchain
56+
run: rustup update --no-self-update ${{ matrix.rust }} && rustup default ${{ matrix.rust }}
57+
- name: Run cargo check
58+
run: cargo check -p windows-sys --all-features
6059

6160
cargo_windows:
6261
name: Check windows
@@ -65,119 +64,119 @@ jobs:
6564
matrix:
6665
rust: [1.59.0, stable, nightly]
6766
steps:
68-
- name: Checkout
69-
uses: actions/checkout@v2
70-
- name: Update toolchain
71-
run: rustup update --no-self-update ${{ matrix.rust }} && rustup default ${{ matrix.rust }}
72-
- name: Run cargo check
73-
run: cargo check -p windows --features Foundation,Win32_Foundation,Win32_Graphics_Direct2D
67+
- name: Checkout
68+
uses: actions/checkout@v2
69+
- name: Update toolchain
70+
run: rustup update --no-self-update ${{ matrix.rust }} && rustup default ${{ matrix.rust }}
71+
- name: Run cargo check
72+
run: cargo check -p windows --features Foundation,Win32_Foundation,Win32_Graphics_Direct2D
7473

7574
cargo_clippy:
7675
name: Check clippy
7776
runs-on: windows-2019
7877
steps:
79-
- name: Checkout
80-
uses: actions/checkout@v2
81-
- name: Update toolchain
82-
run: rustup update --no-self-update nightly && rustup default nightly-x86_64-pc-windows-msvc
83-
- name: Install clippy
84-
run: rustup component add clippy
85-
- name: Configure environment
86-
shell: pwsh
87-
run: |
88-
"C:\Program Files (x86)\Windows Kits\10\bin\10.0.22000.0\x64" >> $env:GITHUB_PATH
89-
((Resolve-Path "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Tools\MSVC\*\bin\Hostx64\x64")
90-
| Sort-Object -Descending | Select -First 1).ToString() >> $env:GITHUB_PATH
91-
(Join-Path $env:GITHUB_WORKSPACE "target\debug\deps").ToString() >> $env:GITHUB_PATH
92-
(Join-Path $env:GITHUB_WORKSPACE "target\test\debug\deps").ToString() >> $env:GITHUB_PATH
93-
"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" `
94-
>> $env:GITHUB_ENV
95-
- name: Run cargo clippy
96-
run: |
97-
cargo clippy -p windows-bindgen &&
98-
cargo clippy -p windows-implement &&
99-
cargo clippy -p windows-interface &&
100-
cargo clippy -p windows-metadata &&
101-
cargo clippy -p windows-sys &&
102-
cargo clippy -p windows-tokens &&
103-
cargo clippy -p windows &&
104-
cargo clippy -p sample_com_uri &&
105-
cargo clippy -p sample_consent &&
106-
cargo clippy -p sample_core_app &&
107-
cargo clippy -p sample_create_window &&
108-
cargo clippy -p sample_create_window_sys &&
109-
cargo clippy -p sample_data_protection &&
110-
cargo clippy -p sample_direct2d &&
111-
cargo clippy -p sample_direct3d12 &&
112-
cargo clippy -p sample_enum_windows &&
113-
cargo clippy -p sample_enum_windows_sys &&
114-
cargo clippy -p sample_kernel_event &&
115-
cargo clippy -p sample_memory_buffer &&
116-
cargo clippy -p sample_message_box &&
117-
cargo clippy -p sample_ocr &&
118-
cargo clippy -p sample_overlapped &&
119-
cargo clippy -p sample_rss &&
120-
cargo clippy -p sample_simple &&
121-
cargo clippy -p sample_spellchecker &&
122-
cargo clippy -p sample_uiautomation &&
123-
cargo clippy -p sample_xml &&
124-
cargo clippy -p windows_aarch64_msvc &&
125-
cargo clippy -p windows_i686_gnu &&
126-
cargo clippy -p windows_i686_msvc &&
127-
cargo clippy -p windows_x86_64_gnu &&
128-
cargo clippy -p windows_x86_64_msvc &&
129-
cargo clippy -p test_agile &&
130-
cargo clippy -p test_agile_reference &&
131-
cargo clippy -p test_alternate_success_code &&
132-
cargo clippy -p test_arch &&
133-
cargo clippy -p test_arch_feature &&
134-
cargo clippy -p test_bstr &&
135-
cargo clippy -p test_cfg_generic &&
136-
cargo clippy -p test_class_factory &&
137-
cargo clippy -p test_component &&
138-
cargo clippy -p test_component_client &&
139-
cargo clippy -p test_const_fields &&
140-
cargo clippy -p test_core &&
141-
cargo clippy -p test_data_object &&
142-
cargo clippy -p test_debug &&
143-
cargo clippy -p test_deprecated &&
144-
cargo clippy -p test_dispatch &&
145-
cargo clippy -p test_does_not_return &&
146-
cargo clippy -p test_drop_target &&
147-
cargo clippy -p test_enums &&
148-
cargo clippy -p test_error &&
149-
cargo clippy -p test_event &&
150-
cargo clippy -p test_handles &&
151-
cargo clippy -p test_helpers &&
152-
cargo clippy -p test_identity &&
153-
cargo clippy -p test_implement &&
154-
cargo clippy -p test_interface &&
155-
cargo clippy -p test_interop &&
156-
cargo clippy -p test_lib &&
157-
cargo clippy -p test_map &&
158-
cargo clippy -p test_matrix3x2 &&
159-
cargo clippy -p test_metadata &&
160-
cargo clippy -p test_mshtml &&
161-
cargo clippy -p test_not_dll &&
162-
cargo clippy -p test_no_use &&
163-
cargo clippy -p test_ntstatus &&
164-
cargo clippy -p test_properties &&
165-
cargo clippy -p test_query_signature &&
166-
cargo clippy -p test_return_struct &&
167-
cargo clippy -p test_string_param &&
168-
cargo clippy -p test_structs &&
169-
cargo clippy -p test_sys &&
170-
cargo clippy -p test_unions &&
171-
cargo clippy -p test_vector &&
172-
cargo clippy -p test_weak &&
173-
cargo clippy -p test_weak_ref &&
174-
cargo clippy -p test_win32 &&
175-
cargo clippy -p test_win32_arrays &&
176-
cargo clippy -p test_winrt &&
177-
cargo clippy -p tool_bindings &&
178-
cargo clippy -p tool_gnu &&
179-
cargo clippy -p tool_ilrs &&
180-
cargo clippy -p tool_msvc &&
181-
cargo clippy -p tool_sys &&
182-
cargo clippy -p tool_windows &&
183-
cargo clippy -p tool_yml
78+
- name: Checkout
79+
uses: actions/checkout@v2
80+
- name: Update toolchain
81+
run: rustup update --no-self-update nightly && rustup default nightly-x86_64-pc-windows-msvc
82+
- name: Install clippy
83+
run: rustup component add clippy
84+
- name: Configure environment
85+
shell: pwsh
86+
run: |
87+
"C:\Program Files (x86)\Windows Kits\10\bin\10.0.22000.0\x64" >> $env:GITHUB_PATH
88+
((Resolve-Path "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Tools\MSVC\*\bin\Hostx64\x64")
89+
| Sort-Object -Descending | Select -First 1).ToString() >> $env:GITHUB_PATH
90+
(Join-Path $env:GITHUB_WORKSPACE "target\debug\deps").ToString() >> $env:GITHUB_PATH
91+
(Join-Path $env:GITHUB_WORKSPACE "target\test\debug\deps").ToString() >> $env:GITHUB_PATH
92+
"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" `
93+
>> $env:GITHUB_ENV
94+
- name: Run cargo clippy
95+
run: |
96+
cargo clippy -p windows-bindgen &&
97+
cargo clippy -p windows-implement &&
98+
cargo clippy -p windows-interface &&
99+
cargo clippy -p windows-metadata &&
100+
cargo clippy -p windows-sys &&
101+
cargo clippy -p windows-tokens &&
102+
cargo clippy -p windows &&
103+
cargo clippy -p sample_com_uri &&
104+
cargo clippy -p sample_consent &&
105+
cargo clippy -p sample_core_app &&
106+
cargo clippy -p sample_create_window &&
107+
cargo clippy -p sample_create_window_sys &&
108+
cargo clippy -p sample_data_protection &&
109+
cargo clippy -p sample_direct2d &&
110+
cargo clippy -p sample_direct3d12 &&
111+
cargo clippy -p sample_enum_windows &&
112+
cargo clippy -p sample_enum_windows_sys &&
113+
cargo clippy -p sample_kernel_event &&
114+
cargo clippy -p sample_memory_buffer &&
115+
cargo clippy -p sample_message_box &&
116+
cargo clippy -p sample_ocr &&
117+
cargo clippy -p sample_overlapped &&
118+
cargo clippy -p sample_rss &&
119+
cargo clippy -p sample_simple &&
120+
cargo clippy -p sample_spellchecker &&
121+
cargo clippy -p sample_uiautomation &&
122+
cargo clippy -p sample_xml &&
123+
cargo clippy -p windows_aarch64_msvc &&
124+
cargo clippy -p windows_i686_gnu &&
125+
cargo clippy -p windows_i686_msvc &&
126+
cargo clippy -p windows_x86_64_gnu &&
127+
cargo clippy -p windows_x86_64_msvc &&
128+
cargo clippy -p test_agile &&
129+
cargo clippy -p test_agile_reference &&
130+
cargo clippy -p test_alternate_success_code &&
131+
cargo clippy -p test_arch &&
132+
cargo clippy -p test_arch_feature &&
133+
cargo clippy -p test_bstr &&
134+
cargo clippy -p test_cfg_generic &&
135+
cargo clippy -p test_class_factory &&
136+
cargo clippy -p test_component &&
137+
cargo clippy -p test_component_client &&
138+
cargo clippy -p test_const_fields &&
139+
cargo clippy -p test_core &&
140+
cargo clippy -p test_data_object &&
141+
cargo clippy -p test_debug &&
142+
cargo clippy -p test_deprecated &&
143+
cargo clippy -p test_dispatch &&
144+
cargo clippy -p test_does_not_return &&
145+
cargo clippy -p test_drop_target &&
146+
cargo clippy -p test_enums &&
147+
cargo clippy -p test_error &&
148+
cargo clippy -p test_event &&
149+
cargo clippy -p test_handles &&
150+
cargo clippy -p test_helpers &&
151+
cargo clippy -p test_identity &&
152+
cargo clippy -p test_implement &&
153+
cargo clippy -p test_interface &&
154+
cargo clippy -p test_interop &&
155+
cargo clippy -p test_lib &&
156+
cargo clippy -p test_map &&
157+
cargo clippy -p test_matrix3x2 &&
158+
cargo clippy -p test_metadata &&
159+
cargo clippy -p test_mshtml &&
160+
cargo clippy -p test_not_dll &&
161+
cargo clippy -p test_no_use &&
162+
cargo clippy -p test_ntstatus &&
163+
cargo clippy -p test_properties &&
164+
cargo clippy -p test_query_signature &&
165+
cargo clippy -p test_return_struct &&
166+
cargo clippy -p test_string_param &&
167+
cargo clippy -p test_structs &&
168+
cargo clippy -p test_sys &&
169+
cargo clippy -p test_unions &&
170+
cargo clippy -p test_vector &&
171+
cargo clippy -p test_weak &&
172+
cargo clippy -p test_weak_ref &&
173+
cargo clippy -p test_win32 &&
174+
cargo clippy -p test_win32_arrays &&
175+
cargo clippy -p test_winrt &&
176+
cargo clippy -p tool_bindings &&
177+
cargo clippy -p tool_gnu &&
178+
cargo clippy -p tool_ilrs &&
179+
cargo clippy -p tool_msvc &&
180+
cargo clippy -p tool_sys &&
181+
cargo clippy -p tool_windows &&
182+
cargo clippy -p tool_yml

‎.github/workflows/cross-compile.yml

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -31,24 +31,24 @@ jobs:
3131
runs-on: ${{ matrix.image }}
3232

3333
steps:
34-
- name: Checkout
35-
uses: actions/checkout@v2
36-
37-
- name: Add toolchain target
38-
run: rustup target add ${{ matrix.target }}
39-
40-
- name: Install gcc-mingw-w64-x86-64
41-
run: sudo apt-get install -y gcc-mingw-w64-x86-64
42-
if: startsWith(matrix.image, 'ubuntu-') && matrix.target == 'x86_64-pc-windows-gnu'
43-
44-
- name: Install mingw-w64
45-
run: brew install mingw-w64
46-
if: startsWith(matrix.image, 'macos-') && matrix.target == 'x86_64-pc-windows-gnu'
47-
48-
- name: Test
49-
shell: pwsh
50-
run: |
51-
cargo test --no-run --target ${{ matrix.target }} -p test_win32
52-
if (-Not (Resolve-Path "target/*/debug/deps/test_win32-*.exe" | Test-Path)) {
53-
throw "Failed to find test_win32 executable."
54-
}
34+
- name: Checkout
35+
uses: actions/checkout@v2
36+
37+
- name: Add toolchain target
38+
run: rustup target add ${{ matrix.target }}
39+
40+
- name: Install gcc-mingw-w64-x86-64
41+
run: sudo apt-get install -y gcc-mingw-w64-x86-64
42+
if: startsWith(matrix.image, 'ubuntu-') && matrix.target == 'x86_64-pc-windows-gnu'
43+
44+
- name: Install mingw-w64
45+
run: brew install mingw-w64
46+
if: startsWith(matrix.image, 'macos-') && matrix.target == 'x86_64-pc-windows-gnu'
47+
48+
- name: Test
49+
shell: pwsh
50+
run: |
51+
cargo test --no-run --target ${{ matrix.target }} -p test_win32
52+
if (-Not (Resolve-Path "target/*/debug/deps/test_win32-*.exe" | Test-Path)) {
53+
throw "Failed to find test_win32 executable."
54+
}

0 commit comments

Comments
 (0)