From 0f8822e627900f864f18caea913aa5b7321d1d41 Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Wed, 2 Oct 2024 15:32:15 -0700 Subject: [PATCH 1/7] Add GitHub Action for BVTs with subset of tests --- .github/dependabot.yml | 2 +- .github/workflows/bvt.yml | 66 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/bvt.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 253bcb7..ca79ca5 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -3,4 +3,4 @@ updates: - package-ecosystem: github-actions directory: / schedule: - interval: daily + interval: weekly diff --git a/.github/workflows/bvt.yml b/.github/workflows/bvt.yml new file mode 100644 index 0000000..8c2943e --- /dev/null +++ b/.github/workflows/bvt.yml @@ -0,0 +1,66 @@ +# Copyright (c) Microsoft Corporation. +# Licensed under the MIT License. +# +# https://go.microsoft.com/fwlink/?LinkID=324981 + +name: 'CTest (BVTs)' + +on: + push: + branches: [ "main" ] + pull_request: + branches: [ "main" ] + paths-ignore: + - '*.md' + - LICENSE + - '.nuget/*' + - build/*.cmd + - build/*.props + - build/*.ps1 + - build/*.targets + - build/*.yml + +permissions: + contents: read + +jobs: + build: + runs-on: ${{ matrix.os }} + timeout-minutes: 20 + + strategy: + fail-fast: false + + matrix: + os: [windows-2019, windows-2022] + build_type: [x64-Debug] + arch: [amd64] + + steps: + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 + + - name: Clone test repository + uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 + with: + repository: walbourn/directxmeshtest + path: Tests + ref: main + + - name: 'Install Ninja' + run: choco install ninja + + - uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1.13.0 + with: + arch: ${{ matrix.arch }} + + - name: 'Configure CMake' + working-directory: ${{ github.workspace }} + run: cmake --preset=${{ matrix.build_type }} -DBUILD_TESTING=ON -DBUILD_TOOLS=OFF -DBUILD_BVT=ON + + - name: 'Build' + working-directory: ${{ github.workspace }} + run: cmake --build out\build\${{ matrix.build_type }} + + - name: 'Run BVTs' + working-directory: ${{ github.workspace }} + run: ctest --preset=${{ matrix.build_type }} From bebd5c2a0c88923dfb275ea33474a5fe4e90fc0a Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Wed, 2 Oct 2024 15:38:03 -0700 Subject: [PATCH 2/7] Code review --- .github/workflows/bvt.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/bvt.yml b/.github/workflows/bvt.yml index 8c2943e..b210e8f 100644 --- a/.github/workflows/bvt.yml +++ b/.github/workflows/bvt.yml @@ -63,4 +63,4 @@ jobs: - name: 'Run BVTs' working-directory: ${{ github.workspace }} - run: ctest --preset=${{ matrix.build_type }} + run: ctest --preset=${{ matrix.build_type }} --output-on-failure From b0e988d57add30ffc01fb00fe3cddedc2f959c34 Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Wed, 2 Oct 2024 15:50:00 -0700 Subject: [PATCH 3/7] Code review --- .github/workflows/bvt.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/bvt.yml b/.github/workflows/bvt.yml index b210e8f..fd1a34f 100644 --- a/.github/workflows/bvt.yml +++ b/.github/workflows/bvt.yml @@ -33,7 +33,7 @@ jobs: matrix: os: [windows-2019, windows-2022] - build_type: [x64-Debug] + build_type: [x64-Debug, x64-Release] arch: [amd64] steps: From 6d31512d8664c160ee8a52107ec97751e61468e7 Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Fri, 4 Oct 2024 12:29:15 -0700 Subject: [PATCH 4/7] Use VCPKG 2403.08.23 release --- .github/workflows/vcpkg.yml | 2 +- .github/workflows/wsl.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/vcpkg.yml b/.github/workflows/vcpkg.yml index 1baf366..ec9c499 100644 --- a/.github/workflows/vcpkg.yml +++ b/.github/workflows/vcpkg.yml @@ -81,7 +81,7 @@ jobs: with: runVcpkgInstall: true vcpkgJsonGlob: '**/build/vcpkg.json' - vcpkgGitCommitId: '7516a02de04e8f8ff4e4beb8f5bac0565f9bf9da' + vcpkgGitCommitId: '3508985146f1b1d248c67ead13f8f54be5b4f5da' - name: 'Configure CMake' working-directory: ${{ github.workspace }} diff --git a/.github/workflows/wsl.yml b/.github/workflows/wsl.yml index a954458..74bf675 100644 --- a/.github/workflows/wsl.yml +++ b/.github/workflows/wsl.yml @@ -40,7 +40,7 @@ jobs: with: runVcpkgInstall: true vcpkgJsonGlob: '**/build/vcpkg.json' - vcpkgGitCommitId: '7516a02de04e8f8ff4e4beb8f5bac0565f9bf9da' + vcpkgGitCommitId: '3508985146f1b1d248c67ead13f8f54be5b4f5da' - name: 'Configure CMake' working-directory: ${{ github.workspace }} From 4e612b5f9e90571e6d5cacda61bab7fdb4fcabe1 Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Fri, 4 Oct 2024 13:51:52 -0700 Subject: [PATCH 5/7] Use repo variable --- .github/workflows/vcpkg.yml | 2 +- .github/workflows/wsl.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/vcpkg.yml b/.github/workflows/vcpkg.yml index ec9c499..525ad20 100644 --- a/.github/workflows/vcpkg.yml +++ b/.github/workflows/vcpkg.yml @@ -81,7 +81,7 @@ jobs: with: runVcpkgInstall: true vcpkgJsonGlob: '**/build/vcpkg.json' - vcpkgGitCommitId: '3508985146f1b1d248c67ead13f8f54be5b4f5da' + vcpkgGitCommitId: '${{ vars.VCPKG_COMMIT_ID }}' - name: 'Configure CMake' working-directory: ${{ github.workspace }} diff --git a/.github/workflows/wsl.yml b/.github/workflows/wsl.yml index 74bf675..de8a977 100644 --- a/.github/workflows/wsl.yml +++ b/.github/workflows/wsl.yml @@ -40,7 +40,7 @@ jobs: with: runVcpkgInstall: true vcpkgJsonGlob: '**/build/vcpkg.json' - vcpkgGitCommitId: '3508985146f1b1d248c67ead13f8f54be5b4f5da' + vcpkgGitCommitId: '${{ vars.VCPKG_COMMIT_ID }}' - name: 'Configure CMake' working-directory: ${{ github.workspace }} From f9e8f52987b6beeff66b8154dd4821d207198adb Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Sat, 5 Oct 2024 10:29:47 -0700 Subject: [PATCH 6/7] Cleanup PAT usage in ADO YAML --- build/DirectXMesh-GitHub-MinGW.yml | 100 ++++++++++++------------ build/DirectXMesh-GitHub-Test-Dev17.yml | 63 ++++++--------- build/DirectXMesh-GitHub-Test.yml | 27 +++---- build/DirectXMesh-GitHub-WSL-11.yml | 41 +++++++--- build/DirectXMesh-GitHub-WSL.yml | 41 +++++++--- 5 files changed, 146 insertions(+), 126 deletions(-) diff --git a/build/DirectXMesh-GitHub-MinGW.yml b/build/DirectXMesh-GitHub-MinGW.yml index bffaf51..cbba922 100644 --- a/build/DirectXMesh-GitHub-MinGW.yml +++ b/build/DirectXMesh-GitHub-MinGW.yml @@ -48,6 +48,16 @@ resources: - repository: self type: git ref: refs/heads/main + - repository: vcpkgRepo + name: Microsoft/vcpkg + type: github + endpoint: microsoft + ref: refs/tags/$(VCPKG_TAG) + - repository: testRepo + name: walbourn/directxmeshtest + type: github + endpoint: microsoft + ref: refs/heads/main name: $(Year:yyyy).$(Month).$(DayOfMonth)$(Rev:.r) @@ -56,8 +66,9 @@ pool: variables: Codeql.Enabled: false - VCPKG_CMAKE_DIR: '$(VCPKG_ROOT)/scripts/buildsystems/vcpkg.cmake' - GITHUB_PAT: $(GITHUBPUBLICTOKEN) + VCPKG_ROOT: $(Build.SourcesDirectory)/vcpkg + VCPKG_CMAKE_DIR: $(Build.SourcesDirectory)/vcpkg/scripts/buildsystems/vcpkg.cmake + VCPKG_MANIFEST_DIR: $(Build.SourcesDirectory)/build 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 HASH_MINGW32: 'fcd1e11b896190da01c83d5b5fb0d37b7c61585e53446c2dab0009debc3915e757213882c35e35396329338de6f0222ba012e23a5af86932db45186a225d1272' @@ -68,12 +79,14 @@ jobs: - checkout: self clean: true fetchTags: false - - task: CmdLine@2 - # We can use the preinstalled vcpkg instead of the latest when MS Hosted updates their vcpkg to the newer DirectX-Headers + fetchDepth: 1 + path: 's' + - checkout: vcpkgRepo displayName: Fetch VCPKG - inputs: - script: git clone --quiet --no-tags https://%GITHUB_PAT%@github.com/microsoft/vcpkg.git - workingDirectory: $(Build.SourcesDirectory) + clean: true + fetchTags: false + fetchDepth: 1 + path: 's/vcpkg' - task: CmdLine@2 displayName: VCPKG Bootstrap inputs: @@ -110,30 +123,22 @@ jobs: inputs: script: g++ --version - task: CmdLine@2 - displayName: VCPKG install headers + displayName: VCPKG install packages inputs: - script: | - call vcpkg install directxmath - @if ERRORLEVEL 1 goto error - call vcpkg install directx-headers - @if ERRORLEVEL 1 goto error - :finish - @echo --- VCPKG COMPLETE --- - exit /b 0 - :error - @echo --- ERROR: VCPKG FAILED --- - exit /b 1 - - workingDirectory: $(Build.SourcesDirectory)\vcpkg + script: call vcpkg install --x-manifest-root=$(VCPKG_MANIFEST_DIR) --triplet=x86-mingw-static + workingDirectory: $(VCPKG_ROOT) - task: CMake@1 displayName: CMake (MinGW32) inputs: - cwd: '$(Build.SourcesDirectory)' - cmakeArgs: -B out -DCMAKE_BUILD_TYPE="Debug" -DDIRECTX_ARCH=x86 -DCMAKE_TOOLCHAIN_FILE="$(VCPKG_CMAKE_DIR)" -DCMAKE_CXX_COMPILER="g++.exe" -G "MinGW Makefiles" -DVCPKG_TARGET_TRIPLET=x86-mingw-static + cwd: $(Build.SourcesDirectory) + cmakeArgs: > + -B out -DCMAKE_BUILD_TYPE="Debug" -DDIRECTX_ARCH=x86 + -DCMAKE_CXX_COMPILER="g++.exe" -G "MinGW Makefiles" + -DCMAKE_TOOLCHAIN_FILE="$(VCPKG_CMAKE_DIR)" -DVCPKG_MANIFEST_DIR="$(VCPKG_MANIFEST_DIR)" -DVCPKG_TARGET_TRIPLET=x86-mingw-static - task: CMake@1 displayName: CMake (MinGW32) Build inputs: - cwd: '$(Build.SourcesDirectory)' + cwd: $(Build.SourcesDirectory) cmakeArgs: --build out - job: MINGW64_BUILD @@ -142,15 +147,20 @@ jobs: - checkout: self clean: true fetchTags: false - - task: CmdLine@2 + fetchDepth: 1 + path: 's' + - checkout: vcpkgRepo displayName: Fetch VCPKG - inputs: - script: git clone --quiet --no-tags https://%GITHUB_PAT%@github.com/microsoft/vcpkg.git - workingDirectory: $(Build.SourcesDirectory) - - task: CmdLine@2 - displayName: Fetch tests - inputs: - script: git clone --quiet --no-tags https://%GITHUB_PAT%@github.com/walbourn/directxmeshtest.git Tests + clean: true + fetchTags: false + fetchDepth: 1 + path: 's/vcpkg' + - checkout: testRepo + displayName: Fetch Tests + clean: true + fetchTags: false + fetchDepth: 1 + path: 's/Tests' - task: CmdLine@2 displayName: VCPKG Bootstrap inputs: @@ -165,28 +175,20 @@ jobs: inputs: script: g++ --version - task: CmdLine@2 - displayName: VCPKG install headers + displayName: VCPKG install packages inputs: - script: | - call vcpkg install directxmath - @if ERRORLEVEL 1 goto error - call vcpkg install directx-headers - @if ERRORLEVEL 1 goto error - :finish - @echo --- VCPKG COMPLETE --- - exit /b 0 - :error - @echo --- ERROR: VCPKG FAILED --- - exit /b 1 - - workingDirectory: $(Build.SourcesDirectory)\vcpkg + script: call vcpkg install --x-manifest-root=$(VCPKG_MANIFEST_DIR) --triplet=x64-mingw-static + workingDirectory: $(VCPKG_ROOT) - task: CMake@1 displayName: CMake (MinGW-W64) inputs: - cwd: '$(Build.SourcesDirectory)' - cmakeArgs: -B out -DCMAKE_BUILD_TYPE="Debug" -DDIRECTX_ARCH=x64 -DCMAKE_TOOLCHAIN_FILE="$(VCPKG_CMAKE_DIR)" -DCMAKE_CXX_COMPILER="g++.exe" -G "MinGW Makefiles" -DVCPKG_TARGET_TRIPLET=x64-mingw-static + cwd: $(Build.SourcesDirectory) + cmakeArgs: > + -B out -DCMAKE_BUILD_TYPE="Debug" -DDIRECTX_ARCH=x64 + -DCMAKE_CXX_COMPILER="g++.exe" -G "MinGW Makefiles" + -DCMAKE_TOOLCHAIN_FILE="$(VCPKG_CMAKE_DIR)" -DVCPKG_MANIFEST_DIR="$(VCPKG_MANIFEST_DIR)" -DVCPKG_TARGET_TRIPLET=x64-mingw-static - task: CMake@1 displayName: CMake (MinGW-W64) Build inputs: - cwd: '$(Build.SourcesDirectory)' + cwd: $(Build.SourcesDirectory) cmakeArgs: --build out diff --git a/build/DirectXMesh-GitHub-Test-Dev17.yml b/build/DirectXMesh-GitHub-Test-Dev17.yml index 5304e38..c6f99c9 100644 --- a/build/DirectXMesh-GitHub-Test-Dev17.yml +++ b/build/DirectXMesh-GitHub-Test-Dev17.yml @@ -28,6 +28,11 @@ resources: type: git ref: refs/heads/main trigger: none + - repository: testRepo + name: walbourn/directxmeshtest + type: github + endpoint: microsoft + ref: refs/heads/main name: $(Year:yyyy).$(Month).$(DayOfMonth)$(Rev:.r) @@ -37,7 +42,6 @@ pool: variables: Codeql.Enabled: false VC_PATH: 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC' - GITHUB_PAT: $(GITHUBPUBLICTOKEN) jobs: - job: DESKTOP_BUILD @@ -48,19 +52,14 @@ jobs: - checkout: self clean: true fetchTags: false - - task: DeleteFiles@1 - displayName: Delete files from Tests - inputs: - SourceFolder: Tests - Contents: '**' - RemoveSourceFolder: true - RemoveDotFiles: true - - task: CmdLine@2 + fetchDepth: 1 + path: 's' + - checkout: testRepo displayName: Fetch Tests - inputs: - script: git clone --quiet --no-tags https://%GITHUB_PAT%@github.com/walbourn/directxmeshtest.git Tests - workingDirectory: $(Build.SourcesDirectory) - failOnStderr: true + clean: true + fetchTags: false + fetchDepth: 1 + path: 's/Tests' - task: VSBuild@1 displayName: Build solution DirectXMesh_Tests_Desktop_2022.sln 32dbg inputs: @@ -161,19 +160,14 @@ jobs: - checkout: self clean: true fetchTags: false - - task: DeleteFiles@1 - displayName: Delete files from Tests - inputs: - SourceFolder: Tests - Contents: '**' - RemoveSourceFolder: true - RemoveDotFiles: true - - task: CmdLine@2 + fetchDepth: 1 + path: 's' + - checkout: testRepo displayName: Fetch Tests - inputs: - script: git clone --quiet --no-tags https://%GITHUB_PAT%@github.com/walbourn/directxmeshtest.git Tests - workingDirectory: $(Build.SourcesDirectory) - failOnStderr: true + clean: true + fetchTags: false + fetchDepth: 1 + path: 's/Tests' - task: CmdLine@2 displayName: Setup environment for CMake to use VS inputs: @@ -248,19 +242,14 @@ jobs: - checkout: self clean: true fetchTags: false - - task: DeleteFiles@1 - displayName: Delete files from Tests - inputs: - SourceFolder: Tests - Contents: '**' - RemoveSourceFolder: true - RemoveDotFiles: true - - task: CmdLine@2 + fetchDepth: 1 + path: 's' + - checkout: testRepo displayName: Fetch Tests - inputs: - script: git clone --quiet --no-tags https://%GITHUB_PAT%@github.com/walbourn/directxmeshtest.git Tests - workingDirectory: $(Build.SourcesDirectory) - failOnStderr: true + clean: true + fetchTags: false + fetchDepth: 1 + path: 's/Tests' - task: CmdLine@2 displayName: Setup environment for CMake to use VS inputs: diff --git a/build/DirectXMesh-GitHub-Test.yml b/build/DirectXMesh-GitHub-Test.yml index a90183c..f73ae00 100644 --- a/build/DirectXMesh-GitHub-Test.yml +++ b/build/DirectXMesh-GitHub-Test.yml @@ -27,15 +27,19 @@ resources: - repository: self type: git ref: refs/heads/main + - repository: testRepo + name: walbourn/directxmeshtest + type: github + endpoint: microsoft + ref: refs/heads/main name: $(Year:yyyy).$(Month).$(DayOfMonth)$(Rev:.r) pool: - Codeql.Enabled: false vmImage: windows-2019 variables: - GITHUB_PAT: $(GITHUBPUBLICTOKEN) + Codeql.Enabled: false jobs: - job: DESKTOP_BUILD @@ -46,19 +50,14 @@ jobs: - checkout: self clean: true fetchTags: false - - task: DeleteFiles@1 - displayName: Delete files from Tests - inputs: - SourceFolder: Tests - Contents: '**' - RemoveSourceFolder: true - RemoveDotFiles: true - - task: CmdLine@2 + fetchDepth: 1 + path: 's' + - checkout: testRepo displayName: Fetch Tests - inputs: - script: git clone --quiet --no-tags https://%GITHUB_PAT%@github.com/walbourn/directxmeshtest.git Tests - workingDirectory: $(Build.SourcesDirectory) - failOnStderr: true + clean: true + fetchTags: false + fetchDepth: 1 + path: 's/Tests' - task: VSBuild@1 displayName: Build solution DirectXMesh_Tests_Desktop_2019.sln 32dbg inputs: diff --git a/build/DirectXMesh-GitHub-WSL-11.yml b/build/DirectXMesh-GitHub-WSL-11.yml index 458a679..cfc404f 100644 --- a/build/DirectXMesh-GitHub-WSL-11.yml +++ b/build/DirectXMesh-GitHub-WSL-11.yml @@ -31,6 +31,16 @@ resources: 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 name: $(Year:yyyy).$(Month).$(DayOfMonth)$(Rev:.r) @@ -39,7 +49,6 @@ pool: variables: Codeql.Enabled: false - GITHUB_PAT: $(GITHUBPUBLICTOKEN) LOCAL_PKG_DIR: '$(Agent.BuildDirectory)/install/' jobs: @@ -51,10 +60,20 @@ jobs: - checkout: self clean: true fetchTags: false - - task: CmdLine@2 - displayName: Fetch directx-headers - inputs: - script: git clone --quiet --no-tags https://%GITHUB_PAT%@github.com/microsoft/DirectX-Headers.git directx-headers + 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' - task: CMake@1 displayName: CMake DirectX-Headers inputs: @@ -70,10 +89,6 @@ jobs: inputs: cwd: directx-headers cmakeArgs: --install . - - task: CmdLine@2 - displayName: Fetch directxmath - inputs: - script: git clone --quiet --no-tags https://%GITHUB_PAT%@github.com/microsoft/DirectXMath.git directxmath - task: CMake@1 displayName: CMake DirectXMath inputs: @@ -106,20 +121,20 @@ jobs: - task: CMake@1 displayName: CMake DirectXMesh (Config) dbg inputs: - cwd: '$(Build.SourcesDirectory)' + cwd: $(Build.SourcesDirectory) cmakeArgs: -B out -DCMAKE_BUILD_TYPE=Debug -DCMAKE_PREFIX_PATH=$(LOCAL_PKG_DIR)/share;$(LOCAL_PKG_DIR)/cmake - task: CMake@1 displayName: CMake DirectXMesh (Build) dbg inputs: - cwd: '$(Build.SourcesDirectory)' + cwd: $(Build.SourcesDirectory) cmakeArgs: --build out -v - task: CMake@1 displayName: CMake DirectXMesh (Config) rel inputs: - cwd: '$(Build.SourcesDirectory)' + cwd: $(Build.SourcesDirectory) cmakeArgs: -B out2 -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH=$(LOCAL_PKG_DIR)/share;$(LOCAL_PKG_DIR)/cmake - task: CMake@1 displayName: CMake DirectXMesh (Build) rel inputs: - cwd: '$(Build.SourcesDirectory)' + cwd: $(Build.SourcesDirectory) cmakeArgs: --build out2 -v diff --git a/build/DirectXMesh-GitHub-WSL.yml b/build/DirectXMesh-GitHub-WSL.yml index d50427f..7b8fd50 100644 --- a/build/DirectXMesh-GitHub-WSL.yml +++ b/build/DirectXMesh-GitHub-WSL.yml @@ -48,6 +48,16 @@ resources: - repository: self type: git ref: refs/heads/main + - 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 name: $(Year:yyyy).$(Month).$(DayOfMonth)$(Rev:.r) @@ -56,7 +66,6 @@ pool: variables: Codeql.Enabled: false - GITHUB_PAT: $(GITHUBPUBLICTOKEN) LOCAL_PKG_DIR: '$(Agent.BuildDirectory)/install/' jobs: @@ -68,10 +77,20 @@ jobs: - checkout: self clean: true fetchTags: false - - task: CmdLine@2 - displayName: Fetch directx-headers - inputs: - script: git clone --quiet --no-tags https://%GITHUB_PAT%@github.com/microsoft/DirectX-Headers.git directx-headers + 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' - task: CMake@1 displayName: CMake DirectX-Headers inputs: @@ -87,10 +106,6 @@ jobs: inputs: cwd: directx-headers cmakeArgs: --install . - - task: CmdLine@2 - displayName: Fetch directxmath - inputs: - script: git clone --quiet --no-tags https://%GITHUB_PAT%@github.com/microsoft/DirectXMath.git directxmath - task: CMake@1 displayName: CMake DirectXMath inputs: @@ -123,20 +138,20 @@ jobs: - task: CMake@1 displayName: CMake DirectXMesh (Config) dbg inputs: - cwd: '$(Build.SourcesDirectory)' + cwd: $(Build.SourcesDirectory) cmakeArgs: -B out -DCMAKE_BUILD_TYPE=Debug -DCMAKE_PREFIX_PATH=$(LOCAL_PKG_DIR)/share;$(LOCAL_PKG_DIR)/cmake - task: CMake@1 displayName: CMake DirectXMesh (Build) dbg inputs: - cwd: '$(Build.SourcesDirectory)' + cwd: $(Build.SourcesDirectory) cmakeArgs: --build out -v - task: CMake@1 displayName: CMake DirectXMesh (Config) rel inputs: - cwd: '$(Build.SourcesDirectory)' + cwd: $(Build.SourcesDirectory) cmakeArgs: -B out2 -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH=$(LOCAL_PKG_DIR)/share;$(LOCAL_PKG_DIR)/cmake - task: CMake@1 displayName: CMake DirectXMesh (Build) rel inputs: - cwd: '$(Build.SourcesDirectory)' + cwd: $(Build.SourcesDirectory) cmakeArgs: --build out2 -v From a43140328a9765bd0ded84ec052b0023a6d2232c Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Sat, 5 Oct 2024 16:21:55 -0700 Subject: [PATCH 7/7] Always run SDL even if no changes --- build/DirectXMesh-SDL.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/build/DirectXMesh-SDL.yml b/build/DirectXMesh-SDL.yml index c637d77..691e364 100644 --- a/build/DirectXMesh-SDL.yml +++ b/build/DirectXMesh-SDL.yml @@ -11,6 +11,7 @@ schedules: branches: include: - main + always: true # GitHub Actions handles CodeQL and PREFAST for CI/PR trigger: none