From f426edef6346a2e01c4fdca6a51619a339dc2b9b Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Mon, 3 Feb 2025 13:58:24 -0800 Subject: [PATCH] Fix some warnings in WSL build due to case (#529) --- build/DirectXTK-GitHub-WSL-11.yml | 16 +-- build/DirectXTK-GitHub-WSL-13.yml | 161 ++++++++++++++++++++++++++++++ build/DirectXTK-GitHub-WSL.yml | 16 +-- 3 files changed, 177 insertions(+), 16 deletions(-) create mode 100644 build/DirectXTK-GitHub-WSL-13.yml diff --git a/build/DirectXTK-GitHub-WSL-11.yml b/build/DirectXTK-GitHub-WSL-11.yml index af1a77b2..693cb91e 100644 --- a/build/DirectXTK-GitHub-WSL-11.yml +++ b/build/DirectXTK-GitHub-WSL-11.yml @@ -72,13 +72,13 @@ jobs: clean: true fetchTags: false fetchDepth: 1 - path: 's/directx-headers' + path: 's/DirectX-Headers' - checkout: dxMathRepo displayName: Fetch DirectX-Math clean: true fetchTags: false fetchDepth: 1 - path: 's/directxmath' + path: 's/DirectXMath' - checkout: testRepo displayName: Fetch Tests clean: true @@ -88,32 +88,32 @@ jobs: - task: CMake@1 displayName: CMake DirectX-Headers inputs: - cwd: directx-headers + cwd: DirectX-Headers cmakeArgs: . -DDXHEADERS_BUILD_TEST=OFF -DDXHEADERS_BUILD_GOOGLE_TEST=OFF -DCMAKE_INSTALL_PREFIX=$(LOCAL_PKG_DIR) - task: CMake@1 displayName: CMake DirectX-Headers (Build) inputs: - cwd: directx-headers + cwd: DirectX-Headers cmakeArgs: --build . -v - task: CMake@1 displayName: CMake DirectX-Headers (Install) inputs: - cwd: directx-headers + cwd: DirectX-Headers cmakeArgs: --install . - task: CMake@1 displayName: CMake DirectXMath inputs: - cwd: directxmath + cwd: DirectXMath cmakeArgs: . -DCMAKE_INSTALL_PREFIX=$(LOCAL_PKG_DIR) - task: CMake@1 displayName: CMake DirectXMath (Build) inputs: - cwd: directxmath + cwd: DirectXMath cmakeArgs: --build . -v - task: CMake@1 displayName: CMake DirectXMath (Install) inputs: - cwd: directxmath + cwd: DirectXMath cmakeArgs: --install . - task: PowerShell@2 displayName: Fetch SAL.H diff --git a/build/DirectXTK-GitHub-WSL-13.yml b/build/DirectXTK-GitHub-WSL-13.yml new file mode 100644 index 00000000..9b3d98ef --- /dev/null +++ b/build/DirectXTK-GitHub-WSL-13.yml @@ -0,0 +1,161 @@ +# Copyright (c) Microsoft Corporation. +# Licensed under the MIT License. +# +# https://go.microsoft.com/fwlink/?LinkId=248929 + +# Builds the SimpleMath module for Windows Subsystem for Linux (WSL) + +schedules: +- cron: "30 3 * * *" + displayName: 'Nightly build' + branches: + include: + - main + +trigger: none + +pr: + branches: + include: + - main + paths: + include: + - CMake* + - build/*.cmake + - build/*.in + - build/DirectXTK-GitHub-WSL-11.yml + +resources: + repositories: + - repository: self + type: git + ref: refs/heads/main + trigger: none + - repository: dxHeadersRepo + name: Microsoft/DirectX-Headers + type: github + endpoint: microsoft + ref: refs/heads/main + - repository: dxMathRepo + name: Microsoft/DirectXMath + type: github + endpoint: microsoft + ref: refs/heads/main + - repository: testRepo + name: walbourn/directxtktest + type: github + endpoint: microsoft + ref: refs/heads/main + +name: $(Year:yyyy).$(Month).$(DayOfMonth)$(Rev:.r) + +pool: + vmImage: ubuntu-24.04 + +variables: + Codeql.Enabled: false + LOCAL_PKG_DIR: '$(Agent.BuildDirectory)/install/' + +jobs: +- job: BUILD_SIMPLEMATH + displayName: SimpleMath + timeoutInMinutes: 120 + cancelTimeoutInMinutes: 1 + steps: + - checkout: self + clean: true + fetchTags: false + fetchDepth: 1 + path: 's' + - checkout: dxHeadersRepo + displayName: Fetch DirectX-Headers + clean: true + fetchTags: false + fetchDepth: 1 + path: 's/DirectX-Headers' + - checkout: dxMathRepo + displayName: Fetch DirectX-Math + clean: true + fetchTags: false + fetchDepth: 1 + path: 's/DirectXMath' + - checkout: testRepo + displayName: Fetch Tests + clean: true + fetchTags: false + fetchDepth: 1 + path: 's/Tests' + - task: CMake@1 + displayName: CMake DirectX-Headers + inputs: + cwd: DirectX-Headers + cmakeArgs: . -DDXHEADERS_BUILD_TEST=OFF -DDXHEADERS_BUILD_GOOGLE_TEST=OFF -DCMAKE_INSTALL_PREFIX=$(LOCAL_PKG_DIR) + - task: CMake@1 + displayName: CMake DirectX-Headers (Build) + inputs: + cwd: DirectX-Headers + cmakeArgs: --build . -v + - task: CMake@1 + displayName: CMake DirectX-Headers (Install) + inputs: + cwd: DirectX-Headers + cmakeArgs: --install . + - task: CMake@1 + displayName: CMake DirectXMath + inputs: + cwd: DirectXMath + cmakeArgs: . -DCMAKE_INSTALL_PREFIX=$(LOCAL_PKG_DIR) + - task: CMake@1 + displayName: CMake DirectXMath (Build) + inputs: + cwd: DirectXMath + cmakeArgs: --build . -v + - task: CMake@1 + displayName: CMake DirectXMath (Install) + inputs: + cwd: DirectXMath + cmakeArgs: --install . + - task: PowerShell@2 + displayName: Fetch SAL.H + inputs: + targetType: inline + script: | + $ProgressPreference = 'SilentlyContinue' + Invoke-WebRequest -Uri https://raw.githubusercontent.com/dotnet/corert/master/src/Native/inc/unix/sal.h -OutFile $(LOCAL_PKG_DIR)/include/sal.h + $fileHash = Get-FileHash -Algorithm SHA512 $(LOCAL_PKG_DIR)/include/sal.h | ForEach { $_.Hash} | Out-String + $filehash = $fileHash.Trim() + Write-Host "##[debug]SHA512: " $filehash + if ($fileHash -ne "1643571673195d9eb892d2f2ac76eac7113ef7aa0ca116d79f3e4d3dc9df8a31600a9668b7e7678dfbe5a76906f9e0734ef8d6db0903ccc68fc742dd8238d8b0") { + Write-Error -Message "##[error]Computed hash does not match!" -ErrorAction Stop + } + + - task: CMake@1 + displayName: CMake SimpleMath (Config) dbg + inputs: + cwd: Tests/SimpleMathTest + cmakeArgs: -B out -DCMAKE_BUILD_TYPE=Debug -DCMAKE_PREFIX_PATH=$(LOCAL_PKG_DIR)/share;$(LOCAL_PKG_DIR)/cmake + - task: CMake@1 + displayName: CMake SimpleMath (Build) dbg + inputs: + cwd: Tests/SimpleMathTest + cmakeArgs: --build out -v + - task: CMake@1 + displayName: CMake SimpleMath (Config) rel + inputs: + cwd: Tests/SimpleMathTest + cmakeArgs: -B out2 -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH=$(LOCAL_PKG_DIR)/share;$(LOCAL_PKG_DIR)/cmake + - task: CMake@1 + displayName: CMake SimpleMath (Build) rel + inputs: + cwd: Tests/SimpleMathTest + cmakeArgs: --build out2 -v + - task: CmdLine@2 + displayName: Run tests dbg + inputs: + script: ./out/bin/simplemathtest + workingDirectory: Tests/SimpleMathTest + - task: CmdLine@2 + displayName: Run tests rel + inputs: + script: ./out2/bin/simplemathtest + workingDirectory: Tests/SimpleMathTest diff --git a/build/DirectXTK-GitHub-WSL.yml b/build/DirectXTK-GitHub-WSL.yml index de6abbeb..42e00003 100644 --- a/build/DirectXTK-GitHub-WSL.yml +++ b/build/DirectXTK-GitHub-WSL.yml @@ -78,13 +78,13 @@ jobs: clean: true fetchTags: false fetchDepth: 1 - path: 's/directx-headers' + path: 's/DirectX-Headers' - checkout: dxMathRepo displayName: Fetch DirectX-Math clean: true fetchTags: false fetchDepth: 1 - path: 's/directxmath' + path: 's/DirectXMath' - checkout: testRepo displayName: Fetch Tests clean: true @@ -94,32 +94,32 @@ jobs: - task: CMake@1 displayName: CMake DirectX-Headers inputs: - cwd: directx-headers + cwd: DirectX-Headers cmakeArgs: . -DDXHEADERS_BUILD_TEST=OFF -DDXHEADERS_BUILD_GOOGLE_TEST=OFF -DCMAKE_INSTALL_PREFIX=$(LOCAL_PKG_DIR) - task: CMake@1 displayName: CMake DirectX-Headers (Build) inputs: - cwd: directx-headers + cwd: DirectX-Headers cmakeArgs: --build . -v - task: CMake@1 displayName: CMake DirectX-Headers (Install) inputs: - cwd: directx-headers + cwd: DirectX-Headers cmakeArgs: --install . - task: CMake@1 displayName: CMake DirectXMath inputs: - cwd: directxmath + cwd: DirectXMath cmakeArgs: . -DCMAKE_INSTALL_PREFIX=$(LOCAL_PKG_DIR) - task: CMake@1 displayName: CMake DirectXMath (Build) inputs: - cwd: directxmath + cwd: DirectXMath cmakeArgs: --build . -v - task: CMake@1 displayName: CMake DirectXMath (Install) inputs: - cwd: directxmath + cwd: DirectXMath cmakeArgs: --install . - task: PowerShell@2 displayName: Fetch SAL.H