Skip to content

Commit 8811a61

Browse files
walbournwalbourn
committed
More YAML code review
1 parent 1502300 commit 8811a61

12 files changed

+29
-21
lines changed

‎.github/workflows/bvt.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright (c) Microsoft Corporation.
22
# Licensed under the MIT License.
33
#
4-
# http://go.microsoft.com/fwlink/?LinkId=248926
4+
# https://go.microsoft.com/fwlink/?LinkId=248926
55

66
name: 'CTest (BVTs)'
77

‎.github/workflows/test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright (c) Microsoft Corporation.
22
# Licensed under the MIT License.
33
#
4-
# http://go.microsoft.com/fwlink/?LinkId=248926
4+
# https://go.microsoft.com/fwlink/?LinkId=248926
55

66
name: 'CTest (Windows)'
77

‎.github/workflows/vcpkg.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright (c) Microsoft Corporation.
22
# Licensed under the MIT License.
33
#
4-
# http://go.microsoft.com/fwlink/?LinkId=248926
4+
# https://go.microsoft.com/fwlink/?LinkId=248926
55

66
name: 'CMake (Windows using VCPKG)'
77

‎.github/workflows/wsl.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright (c) Microsoft Corporation.
22
# Licensed under the MIT License.
33
#
4-
# http://go.microsoft.com/fwlink/?LinkId=248926
4+
# https://go.microsoft.com/fwlink/?LinkId=248926
55

66
name: 'CMake (WSL)'
77

‎build/DirectXTex-GitHub-CMake-Dev17.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright (c) Microsoft Corporation.
22
# Licensed under the MIT License.
33
#
4-
# http://go.microsoft.com/fwlink/?LinkId=248926
4+
# https://go.microsoft.com/fwlink/?LinkId=248926
55

66
# Builds the library using CMake with VS Generator (GitHub Actions covers Ninja).
77

‎build/DirectXTex-GitHub-CMake.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright (c) Microsoft Corporation.
22
# Licensed under the MIT License.
33
#
4-
# http://go.microsoft.com/fwlink/?LinkId=248926
4+
# https://go.microsoft.com/fwlink/?LinkId=248926
55

66
# Builds the library using CMake with VS Generator (GitHub Actions covers Ninja).
77

‎build/DirectXTex-GitHub-MinGW.yml

+18-10
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright (c) Microsoft Corporation.
22
# Licensed under the MIT License.
33
#
4-
# http://go.microsoft.com/fwlink/?LinkId=248926
4+
# https://go.microsoft.com/fwlink/?LinkId=248926
55

66
# Builds the library and test suite using the MinGW compiler.
77

@@ -155,7 +155,8 @@ jobs:
155155
cwd: $(Build.SourcesDirectory)
156156
cmakeArgs: >
157157
-B out -DCMAKE_BUILD_TYPE="Debug" -DDIRECTX_ARCH=x86
158-
-DCMAKE_CXX_COMPILER="g++.exe" -G "MinGW Makefiles" -DUSE_PREBUILT_SHADERS=ON -DCOMPILED_SHADERS=$(Build.BinariesDirectory)\Shaders
158+
-DCMAKE_CXX_COMPILER="g++.exe" -G "MinGW Makefiles"
159+
-DUSE_PREBUILT_SHADERS=ON -DCOMPILED_SHADERS=$(Build.BinariesDirectory)\Shaders
159160
-DCMAKE_TOOLCHAIN_FILE="$(VCPKG_CMAKE_DIR)" -DVCPKG_MANIFEST_DIR="$(VCPKG_MANIFEST_DIR)" -DVCPKG_TARGET_TRIPLET=x86-mingw-static
160161
- task: CMake@1
161162
displayName: CMake (MinGW32) Build
@@ -168,7 +169,8 @@ jobs:
168169
cwd: $(Build.SourcesDirectory)
169170
cmakeArgs: >
170171
-B out2 -DCMAKE_BUILD_TYPE="Debug" -DENABLE_OPENEXR_SUPPORT=ON -DDIRECTX_ARCH=x86
171-
-DCMAKE_CXX_COMPILER="g++.exe" -G "MinGW Makefiles" -DUSE_PREBUILT_SHADERS=ON -DCOMPILED_SHADERS=$(Build.BinariesDirectory)\Shaders
172+
-DCMAKE_CXX_COMPILER="g++.exe" -G "MinGW Makefiles"
173+
-DUSE_PREBUILT_SHADERS=ON -DCOMPILED_SHADERS=$(Build.BinariesDirectory)\Shaders
172174
-DCMAKE_TOOLCHAIN_FILE="$(VCPKG_CMAKE_DIR)" -DVCPKG_MANIFEST_DIR="$(VCPKG_MANIFEST_DIR)" -DVCPKG_TARGET_TRIPLET=x86-mingw-static
173175
- task: CMake@1
174176
displayName: CMake (MinGW32) Build w/ OpenEXR
@@ -181,7 +183,8 @@ jobs:
181183
cwd: $(Build.SourcesDirectory)
182184
cmakeArgs: >
183185
-B out3 -DCMAKE_BUILD_TYPE="Debug" -DENABLE_LIBJPEG_SUPPORT=ON -DDIRECTX_ARCH=x86
184-
-DCMAKE_CXX_COMPILER="g++.exe" -G "MinGW Makefiles" -DUSE_PREBUILT_SHADERS=ON -DCOMPILED_SHADERS=$(Build.BinariesDirectory)\Shaders
186+
-DCMAKE_CXX_COMPILER="g++.exe" -G "MinGW Makefiles"
187+
-DUSE_PREBUILT_SHADERS=ON -DCOMPILED_SHADERS=$(Build.BinariesDirectory)\Shaders
185188
-DCMAKE_TOOLCHAIN_FILE="$(VCPKG_CMAKE_DIR)" -DVCPKG_MANIFEST_DIR="$(VCPKG_MANIFEST_DIR)" -DVCPKG_TARGET_TRIPLET=x86-mingw-static
186189
- task: CMake@1
187190
displayName: CMake (MinGW32) Build w/ libjpeg
@@ -194,7 +197,8 @@ jobs:
194197
cwd: $(Build.SourcesDirectory)
195198
cmakeArgs: >
196199
-B out4 -DCMAKE_BUILD_TYPE="Debug" -DENABLE_LIBPNG_SUPPORT=ON -DDIRECTX_ARCH=x86
197-
-DCMAKE_CXX_COMPILER="g++.exe" -G "MinGW Makefiles" -DUSE_PREBUILT_SHADERS=ON -DCOMPILED_SHADERS=$(Build.BinariesDirectory)\Shaders
200+
-DCMAKE_CXX_COMPILER="g++.exe" -G "MinGW Makefiles"
201+
-DUSE_PREBUILT_SHADERS=ON -DCOMPILED_SHADERS=$(Build.BinariesDirectory)\Shaders
198202
-DCMAKE_TOOLCHAIN_FILE="$(VCPKG_CMAKE_DIR)" -DVCPKG_MANIFEST_DIR="$(VCPKG_MANIFEST_DIR)" -DVCPKG_TARGET_TRIPLET=x86-mingw-static
199203
- task: CMake@1
200204
displayName: CMake (MinGW32) Build w/ libpng
@@ -203,7 +207,7 @@ jobs:
203207
cmakeArgs: --build out4
204208

205209
- job: MINGW64_BUILD
206-
displayName: 'Minimalist GNU for Windows (MinGW-W64)'
210+
displayName: 'Minimalist GNU for Windows (MinGW-W64) BUILD_TESTING=ON'
207211
steps:
208212
- checkout: self
209213
clean: true
@@ -273,7 +277,8 @@ jobs:
273277
cwd: $(Build.SourcesDirectory)
274278
cmakeArgs: >
275279
-B out -DCMAKE_BUILD_TYPE="Debug" -DDIRECTX_ARCH=x64
276-
-DCMAKE_CXX_COMPILER="g++.exe" -G "MinGW Makefiles" -DUSE_PREBUILT_SHADERS=ON -DCOMPILED_SHADERS=$(Build.BinariesDirectory)\Shaders
280+
-DCMAKE_CXX_COMPILER="g++.exe" -G "MinGW Makefiles"
281+
-DUSE_PREBUILT_SHADERS=ON -DCOMPILED_SHADERS=$(Build.BinariesDirectory)\Shaders
277282
-DCMAKE_TOOLCHAIN_FILE="$(VCPKG_CMAKE_DIR)" -DVCPKG_MANIFEST_DIR="$(VCPKG_MANIFEST_DIR)" -DVCPKG_TARGET_TRIPLET=x64-mingw-static
278283
- task: CMake@1
279284
displayName: CMake (MinGW-W64) Build
@@ -286,7 +291,8 @@ jobs:
286291
cwd: $(Build.SourcesDirectory)
287292
cmakeArgs: >
288293
-B out2 -DCMAKE_BUILD_TYPE="Debug" -DENABLE_OPENEXR_SUPPORT=ON -DDIRECTX_ARCH=x64 -DBUILD_TESTING=OFF
289-
-DCMAKE_CXX_COMPILER="g++.exe" -G "MinGW Makefiles" -DUSE_PREBUILT_SHADERS=ON -DCOMPILED_SHADERS=$(Build.BinariesDirectory)\Shaders
294+
-DCMAKE_CXX_COMPILER="g++.exe" -G "MinGW Makefiles"
295+
-DUSE_PREBUILT_SHADERS=ON -DCOMPILED_SHADERS=$(Build.BinariesDirectory)\Shaders
290296
-DCMAKE_TOOLCHAIN_FILE="$(VCPKG_CMAKE_DIR)" -DVCPKG_MANIFEST_DIR="$(VCPKG_MANIFEST_DIR)" -DVCPKG_TARGET_TRIPLET=x64-mingw-static
291297
- task: CMake@1
292298
displayName: CMake (MinGW-W64) Build w/ OpenEXR
@@ -299,7 +305,8 @@ jobs:
299305
cwd: $(Build.SourcesDirectory)
300306
cmakeArgs: >
301307
-B out3 -DCMAKE_BUILD_TYPE="Debug" -DENABLE_LIBJPEG_SUPPORT=ON -DDIRECTX_ARCH=x64 -DBUILD_TESTING=OFF
302-
-DCMAKE_CXX_COMPILER="g++.exe" -G "MinGW Makefiles" -DUSE_PREBUILT_SHADERS=ON -DCOMPILED_SHADERS=$(Build.BinariesDirectory)\Shaders
308+
-DCMAKE_CXX_COMPILER="g++.exe" -G "MinGW Makefiles"
309+
-DUSE_PREBUILT_SHADERS=ON -DCOMPILED_SHADERS=$(Build.BinariesDirectory)\Shaders
303310
-DCMAKE_TOOLCHAIN_FILE="$(VCPKG_CMAKE_DIR)" -DVCPKG_MANIFEST_DIR="$(VCPKG_MANIFEST_DIR)" -DVCPKG_TARGET_TRIPLET=x64-mingw-static
304311
- task: CMake@1
305312
displayName: CMake (MinGW-W64) Build w/ libjpeg
@@ -312,7 +319,8 @@ jobs:
312319
cwd: $(Build.SourcesDirectory)
313320
cmakeArgs: >
314321
-B out4 -DCMAKE_BUILD_TYPE="Debug" -DENABLE_LIBPNG_SUPPORT=ON -DDIRECTX_ARCH=x64 -DBUILD_TESTING=OFF
315-
-DCMAKE_CXX_COMPILER="g++.exe" -G "MinGW Makefiles" -DUSE_PREBUILT_SHADERS=ON -DCOMPILED_SHADERS=$(Build.BinariesDirectory)\Shaders
322+
-DCMAKE_CXX_COMPILER="g++.exe" -G "MinGW Makefiles"
323+
-DUSE_PREBUILT_SHADERS=ON -DCOMPILED_SHADERS=$(Build.BinariesDirectory)\Shaders
316324
-DCMAKE_TOOLCHAIN_FILE="$(VCPKG_CMAKE_DIR)" -DVCPKG_MANIFEST_DIR="$(VCPKG_MANIFEST_DIR)" -DVCPKG_TARGET_TRIPLET=x64-mingw-static
317325
- task: CMake@1
318326
displayName: CMake (MinGW-W64) Build w/ libpng

‎build/DirectXTex-GitHub-Test-Dev17.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright (c) Microsoft Corporation.
22
# Licensed under the MIT License.
33
#
4-
# http://go.microsoft.com/fwlink/?LinkId=248926
4+
# https://go.microsoft.com/fwlink/?LinkId=248926
55

66
# Builds the library and test suite.
77

‎build/DirectXTex-GitHub-Test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright (c) Microsoft Corporation.
22
# Licensed under the MIT License.
33
#
4-
# http://go.microsoft.com/fwlink/?LinkId=248926
4+
# https://go.microsoft.com/fwlink/?LinkId=248926
55

66
# Builds the library and test suite.
77

‎build/DirectXTex-GitHub-WSL-11.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright (c) Microsoft Corporation.
22
# Licensed under the MIT License.
33
#
4-
# http://go.microsoft.com/fwlink/?LinkId=248926
4+
# https://go.microsoft.com/fwlink/?LinkId=248926
55

66
# Builds the library for Windows Subsystem for Linux (WSL)
77

‎build/DirectXTex-GitHub-WSL.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright (c) Microsoft Corporation.
22
# Licensed under the MIT License.
33
#
4-
# http://go.microsoft.com/fwlink/?LinkId=248926
4+
# https://go.microsoft.com/fwlink/?LinkId=248926
55

66
# Builds the library for Windows Subsystem for Linux (WSL)
77

‎build/DirectXTex-OneFuzz-Coverage.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright (c) Microsoft Corporation.
22
# Licensed under the MIT License.
33
#
4-
# http://go.microsoft.com/fwlink/?LinkId=248926
4+
# https://go.microsoft.com/fwlink/?LinkId=248926
55

66
# OneFuzz code coverage pipeline
77

0 commit comments

Comments
 (0)