Skip to content

Commit 1058363

Browse files
walbournwalbourn
committed
Yet More YAML lint
1 parent 319b05d commit 1058363

File tree

9 files changed

+50
-34
lines changed

9 files changed

+50
-34
lines changed

‎.azuredevops/pipelines/DirectXMath-GitHub-CMake-Dev17.yml‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,8 @@ jobs:
6868
displayName: 'CMake (MSVC): Config x64'
6969
inputs:
7070
cwd: '$(Build.SourcesDirectory)'
71-
cmakeArgs: '-G "$(VS_GENERATOR)" -A x64 -B out -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)'
71+
cmakeArgs: >
72+
-G "$(VS_GENERATOR)" -A x64 -B out -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
7273
- task: CMake@1
7374
displayName: 'CMake (MSVC): Build x64 Debug'
7475
inputs:
@@ -83,7 +84,8 @@ jobs:
8384
displayName: 'CMake (MSVC): Config x86'
8485
inputs:
8586
cwd: '$(Build.SourcesDirectory)'
86-
cmakeArgs: '-G "$(VS_GENERATOR)" -A Win32 -B out2 -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)'
87+
cmakeArgs: >
88+
-G "$(VS_GENERATOR)" -A Win32 -B out2 -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
8789
- task: CMake@1
8890
displayName: 'CMake (MSVC): Build x86 Debug'
8991
inputs:
@@ -98,7 +100,8 @@ jobs:
98100
displayName: 'CMake (MSVC): Config ARM64'
99101
inputs:
100102
cwd: '$(Build.SourcesDirectory)'
101-
cmakeArgs: '-G "$(VS_GENERATOR)" -A ARM64 -B out3 -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)'
103+
cmakeArgs: >
104+
-G "$(VS_GENERATOR)" -A ARM64 -B out3 -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
102105
- task: CMake@1
103106
displayName: 'CMake (MSVC): Build ARM64 Debug'
104107
inputs:
@@ -113,7 +116,8 @@ jobs:
113116
displayName: 'CMake (ClangCl): Config x64'
114117
inputs:
115118
cwd: '$(Build.SourcesDirectory)'
116-
cmakeArgs: '-G "$(VS_GENERATOR)" -A x64 -T clangcl -B out4 -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)'
119+
cmakeArgs: >
120+
-G "$(VS_GENERATOR)" -A x64 -T clangcl -B out4 -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
117121
- task: CMake@1
118122
displayName: 'CMake (ClangCl): Build x64 Debug'
119123
inputs:
@@ -128,7 +132,8 @@ jobs:
128132
displayName: 'CMake (ClangCl): Config ARM64'
129133
inputs:
130134
cwd: '$(Build.SourcesDirectory)'
131-
cmakeArgs: '-G "$(VS_GENERATOR)" -A ARM64 -T clangcl -B out5 -DCMAKE_SYSTEM_VERSION=$(WIN11_SDK)'
135+
cmakeArgs: >
136+
-G "$(VS_GENERATOR)" -A ARM64 -T clangcl -B out5 -DCMAKE_SYSTEM_VERSION=$(WIN11_SDK)
132137
- task: CMake@1
133138
displayName: 'CMake (ClangCl): Build ARM64 Debug'
134139
inputs:

‎.azuredevops/pipelines/DirectXMath-GitHub-CMake.yml‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,8 @@ jobs:
7676
displayName: CMake (MSVC x64)
7777
inputs:
7878
cwd: '$(Build.SourcesDirectory)'
79-
cmakeArgs: '-G "$(VS_GENERATOR)" -A x64 -B out -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)'
79+
cmakeArgs: >
80+
-G "$(VS_GENERATOR)" -A x64 -B out -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
8081
- task: CMake@1
8182
displayName: CMake (Build x64)
8283
inputs:
@@ -86,7 +87,8 @@ jobs:
8687
displayName: CMake Test (MSVC x64)
8788
inputs:
8889
cwd: Tests
89-
cmakeArgs: '-G "$(VS_GENERATOR)" -A x64 -B out -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)'
90+
cmakeArgs: >
91+
-G "$(VS_GENERATOR)" -A x64 -B out -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
9092
- task: CMake@1
9193
displayName: CMake Test (Build x64)
9294
inputs:
@@ -96,7 +98,8 @@ jobs:
9698
displayName: CMake (MSVC ARM64)
9799
inputs:
98100
cwd: '$(Build.SourcesDirectory)'
99-
cmakeArgs: '-G "$(VS_GENERATOR)" -A ARM64 -B out2 -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)'
101+
cmakeArgs: >
102+
-G "$(VS_GENERATOR)" -A ARM64 -B out2 -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
100103
- task: CMake@1
101104
displayName: CMake (Build ARM64)
102105
inputs:
@@ -106,7 +109,8 @@ jobs:
106109
displayName: CMake Test (MSVC ARM64)
107110
inputs:
108111
cwd: Tests
109-
cmakeArgs: '-G "$(VS_GENERATOR)" -A ARM64 -B out2 -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)'
112+
cmakeArgs: >
113+
-G "$(VS_GENERATOR)" -A ARM64 -B out2 -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
110114
- task: CMake@1
111115
displayName: CMake Test (Build ARM64)
112116
inputs:
@@ -116,7 +120,8 @@ jobs:
116120
displayName: CMake (ClangCl)
117121
inputs:
118122
cwd: '$(Build.SourcesDirectory)'
119-
cmakeArgs: '-G "$(VS_GENERATOR)" -A x64 -T clangcl -B out3 -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)'
123+
cmakeArgs: >
124+
-G "$(VS_GENERATOR)" -A x64 -T clangcl -B out3 -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
120125
- task: CMake@1
121126
displayName: CMake (Build)
122127
inputs:
@@ -126,7 +131,8 @@ jobs:
126131
displayName: CMake Test (ClangCL)
127132
inputs:
128133
cwd: Tests
129-
cmakeArgs: '-G "$(VS_GENERATOR)" -A x64 -T clangcl -B out3 -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)'
134+
cmakeArgs: >
135+
-G "$(VS_GENERATOR)" -A x64 -T clangcl -B out3 -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
130136
- task: CMake@1
131137
displayName: CMake Test (Build)
132138
inputs:

‎.azuredevops/pipelines/DirectXMath-GitHub-MinGW.yml‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ trigger:
1818
- main
1919
paths:
2020
exclude:
21-
- '*.md'
22-
- LICENSE
23-
- '.github/**'
24-
- '.nuget/*'
25-
- build/*.ps1
21+
- '*.md'
22+
- LICENSE
23+
- '.github/**'
24+
- '.nuget/*'
25+
- build/*.ps1
2626

2727
pr:
2828
branches:
@@ -62,7 +62,8 @@ variables:
6262
VCPKG_ROOT: $(Build.SourcesDirectory)/vcpkg
6363
VCPKG_CMAKE_DIR: $(Build.SourcesDirectory)/vcpkg/scripts/buildsystems/vcpkg.cmake
6464
VCPKG_MANIFEST_DIR: $(Build.SourcesDirectory)/build
65-
URL_MINGW32: https://github.com/brechtsanders/winlibs_mingw/releases/download/12.2.0-14.0.6-10.0.0-ucrt-r2/winlibs-i686-posix-dwarf-gcc-12.2.0-llvm-14.0.6-mingw-w64ucrt-10.0.0-r2.zip
65+
BASE_URL: https://github.com/brechtsanders/winlibs_mingw/releases/download
66+
URL_MINGW32: $(BASE_URL)/12.2.0-14.0.6-10.0.0-ucrt-r2/winlibs-i686-posix-dwarf-gcc-12.2.0-llvm-14.0.6-mingw-w64ucrt-10.0.0-r2.zip
6667
HASH_MINGW32: 'fcd1e11b896190da01c83d5b5fb0d37b7c61585e53446c2dab0009debc3915e757213882c35e35396329338de6f0222ba012e23a5af86932db45186a225d1272'
6768

6869
jobs:

‎.azuredevops/pipelines/DirectXMath-GitHub-WSL-11.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ pool:
4444

4545
variables:
4646
Codeql.Enabled: false
47+
SAL_URL: https://raw.githubusercontent.com/dotnet/runtime/v8.0.1/src/coreclr/pal/inc/rt/sal.h
4748

4849
jobs:
4950
- job: BUILD_WSL
@@ -71,7 +72,7 @@ jobs:
7172
targetType: inline
7273
script: |
7374
$ProgressPreference = 'SilentlyContinue'
74-
Invoke-WebRequest -Uri https://raw.githubusercontent.com/dotnet/runtime/v8.0.1/src/coreclr/pal/inc/rt/sal.h -OutFile $(Build.SourcesDirectory)/Inc/sal.h
75+
Invoke-WebRequest -Uri "$(SAL_URL)" -OutFile $(Build.SourcesDirectory)/Inc/sal.h
7576
$fileHash = Get-FileHash -Algorithm SHA512 $(Build.SourcesDirectory)/Inc/sal.h | ForEach { $_.Hash} | Out-String
7677
$filehash = $fileHash.Trim()
7778
Write-Host "##[debug]SHA512: " $filehash

‎.azuredevops/pipelines/DirectXMath-GitHub-WSL-13.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ pool:
4444

4545
variables:
4646
Codeql.Enabled: false
47+
SAL_URL: https://raw.githubusercontent.com/dotnet/runtime/v8.0.1/src/coreclr/pal/inc/rt/sal.h
4748

4849
jobs:
4950
- job: BUILD_WSL
@@ -71,7 +72,7 @@ jobs:
7172
targetType: inline
7273
script: |
7374
$ProgressPreference = 'SilentlyContinue'
74-
Invoke-WebRequest -Uri https://raw.githubusercontent.com/dotnet/runtime/v8.0.1/src/coreclr/pal/inc/rt/sal.h -OutFile $(Build.SourcesDirectory)/Inc/sal.h
75+
Invoke-WebRequest -Uri "$(SAL_URL)" -OutFile $(Build.SourcesDirectory)/Inc/sal.h
7576
$fileHash = Get-FileHash -Algorithm SHA512 $(Build.SourcesDirectory)/Inc/sal.h | ForEach { $_.Hash} | Out-String
7677
$filehash = $fileHash.Trim()
7778
Write-Host "##[debug]SHA512: " $filehash

‎.azuredevops/pipelines/DirectXMath-GitHub.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ schedules:
1010
displayName: 'Nightly build'
1111
branches:
1212
include:
13-
- main
13+
- main
1414

1515
# GitHub Actions handles MSBuild for CI/PR
1616
trigger: none
@@ -24,14 +24,14 @@ pr:
2424

2525
resources:
2626
repositories:
27-
- repository: self
28-
type: git
29-
ref: refs/heads/main
30-
- repository: testRepo
31-
name: walbourn/directxmathtest
32-
type: github
33-
endpoint: microsoft
34-
ref: refs/heads/main
27+
- repository: self
28+
type: git
29+
ref: refs/heads/main
30+
- repository: testRepo
31+
name: walbourn/directxmathtest
32+
type: github
33+
endpoint: microsoft
34+
ref: refs/heads/main
3535

3636
name: $(Year:yyyy).$(Month).$(DayOfMonth)$(Rev:.r)
3737

‎.azuredevops/policies/approvercountpolicy.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: approver_count
22
description: Approver count policy for mscodehub/DirectXMath/DirectXMath repository
33
resource: repository
4-
where:
4+
where:
55
configuration:
66
approverCountPolicySettings:
77
isBlocking: true
@@ -15,6 +15,6 @@ configuration:
1515
resetRejectionsOnSourcePush: false
1616
blockLastPusherVote: true
1717
branchNames:
18-
- refs/heads/release
19-
- refs/heads/main
18+
- refs/heads/release
19+
- refs/heads/main
2020
displayName: mscodehub/DirectXMath/DirectXMath Approver Count Policy

‎.github/linters/.yaml-lint.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ rules:
1010
check-keys: false
1111
document-start: disable
1212
line-length:
13-
max: 100
13+
max: 150
1414
comments:
15-
min-spaces-from-content: 1
15+
min-spaces-from-content: 1

‎.github/workflows/shmath.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,9 @@ jobs:
9595

9696
- name: 'Configure CMake'
9797
working-directory: ${{ github.workspace }}
98-
run: cmake --preset=${{ matrix.build_type }} -DBUILD_SHMATH=ON -DBUILD_DX11=ON -DBUILD_DX12=ON
98+
run: >
99+
cmake --preset=${{ matrix.build_type }}
100+
-DBUILD_SHMATH=ON -DBUILD_DX11=ON -DBUILD_DX12=ON
99101
100102
- name: 'Build'
101103
working-directory: ${{ github.workspace }}

0 commit comments

Comments
 (0)