From 2dbf4f61634b545cc8a66bc3b353c1e73d62ad1a Mon Sep 17 00:00:00 2001 From: Adam Sawicki Date: Thu, 17 Apr 2025 11:30:08 +0200 Subject: [PATCH 1/9] Added GitHub Actions file windows.yaml --- github/workflows/windows.yaml | 52 +++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 github/workflows/windows.yaml diff --git a/github/workflows/windows.yaml b/github/workflows/windows.yaml new file mode 100644 index 0000000..cddef53 --- /dev/null +++ b/github/workflows/windows.yaml @@ -0,0 +1,52 @@ +name: Build code + +on: + push: + pull_request: + types: [opened, synchronize, reopened] + +env: + FOO: "BAR" + +jobs: + windows: + name: ${{ matrix.config.name }} + runs-on: windows-latest + strategy: + fail-fast: false + matrix: + config: + - { + name: "Windows MSVC (Debug)", + compiler: "msvc", + cc: "cl", cxx: "cl", + cmake_configure_options: '-G "Visual Studio 17 2022" -A x64', + build_type: "Debug", + } + #- { + # name: "Windows MSVC (Release)", + # compiler: "msvc", + # cc: "cl", cxx: "cl", + # cmake_configure_options: '-G "Visual Studio 17 2022" -A x64', + # build_type: "Release", + #} + + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Configure CMake + shell: pwsh + run: | + $env:CC="${{ matrix.config.cc }}" + $env:CXX="${{ matrix.config.cxx }}" + cmake . ` + -Bbuild ` + -DCMAKE_BUILD_TYPE=${{ matrix.config.build_type }} ` + -DD3D12MA_BUILD_SAMPLE=ON ` + ${{ matrix.config.cmake_configure_options }} + + - name: Build + shell: pwsh + run: | + cmake --build build --config ${{ matrix.config.build_type }} From cab011df2965c1d2b8496699a53d2d187cef4274 Mon Sep 17 00:00:00 2001 From: Adam Sawicki Date: Thu, 17 Apr 2025 11:32:09 +0200 Subject: [PATCH 2/9] Fixed folder name: .github --- {github => .github}/workflows/windows.yaml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {github => .github}/workflows/windows.yaml (100%) diff --git a/github/workflows/windows.yaml b/.github/workflows/windows.yaml similarity index 100% rename from github/workflows/windows.yaml rename to .github/workflows/windows.yaml From 686803d364256bf0bf36a03cfc7afcb0bd1bd4bc Mon Sep 17 00:00:00 2001 From: Adam Sawicki Date: Thu, 17 Apr 2025 11:44:02 +0200 Subject: [PATCH 3/9] Testing downloading and usage of the Agility SDK Should fail for now. --- .github/workflows/windows.yaml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/windows.yaml b/.github/workflows/windows.yaml index cddef53..2a2eb05 100644 --- a/.github/workflows/windows.yaml +++ b/.github/workflows/windows.yaml @@ -6,7 +6,7 @@ on: types: [opened, synchronize, reopened] env: - FOO: "BAR" + DX_AGILITY_SDK_URL: "https://www.nuget.org/api/v2/package/Microsoft.Direct3D.D3D12/1.615.1" jobs: windows: @@ -35,6 +35,13 @@ jobs: - name: Checkout uses: actions/checkout@v4 + - name: Download DirectX 12 Agility SDK + shell: pwsh + run: | + $ProgressPreference = 'SilentlyContinue' + Invoke-WebRequest -Uri $env:DX_AGILITY_SDK_URL -OutFile "d3d12.zip" + Expand-Archive -Path "d3d12.zip" -DestinationPath "d3d12_sdk" + - name: Configure CMake shell: pwsh run: | @@ -44,6 +51,7 @@ jobs: -Bbuild ` -DCMAKE_BUILD_TYPE=${{ matrix.config.build_type }} ` -DD3D12MA_BUILD_SAMPLE=ON ` + -DD3D12MA_AGILITY_SDK_DIRECTORY=INVALID ` ${{ matrix.config.cmake_configure_options }} - name: Build From 542a8cc5f36e700974d4c6549a182ee3f1601f27 Mon Sep 17 00:00:00 2001 From: Adam Sawicki Date: Thu, 17 Apr 2025 11:48:20 +0200 Subject: [PATCH 4/9] Fix for Agility SDK --- .github/workflows/windows.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows.yaml b/.github/workflows/windows.yaml index 2a2eb05..84c99ce 100644 --- a/.github/workflows/windows.yaml +++ b/.github/workflows/windows.yaml @@ -51,7 +51,7 @@ jobs: -Bbuild ` -DCMAKE_BUILD_TYPE=${{ matrix.config.build_type }} ` -DD3D12MA_BUILD_SAMPLE=ON ` - -DD3D12MA_AGILITY_SDK_DIRECTORY=INVALID ` + -DD3D12MA_AGILITY_SDK_DIRECTORY=$env:DX_AGILITY_SDK_URL ` ${{ matrix.config.cmake_configure_options }} - name: Build From 8e977042385bd3cebf2d7e70657953bfcf9f485e Mon Sep 17 00:00:00 2001 From: Adam Sawicki Date: Thu, 17 Apr 2025 11:57:24 +0200 Subject: [PATCH 5/9] Trying to fix the path to Agility SDK --- .github/workflows/windows.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/windows.yaml b/.github/workflows/windows.yaml index 84c99ce..0121da5 100644 --- a/.github/workflows/windows.yaml +++ b/.github/workflows/windows.yaml @@ -41,6 +41,7 @@ jobs: $ProgressPreference = 'SilentlyContinue' Invoke-WebRequest -Uri $env:DX_AGILITY_SDK_URL -OutFile "d3d12.zip" Expand-Archive -Path "d3d12.zip" -DestinationPath "d3d12_sdk" + echo "DX_AGILITY_SDK_PATH=$env:GITHUB_WORKSPACE/d3d12_sdk" >> $env:GITHUB_ENV - name: Configure CMake shell: pwsh @@ -51,7 +52,7 @@ jobs: -Bbuild ` -DCMAKE_BUILD_TYPE=${{ matrix.config.build_type }} ` -DD3D12MA_BUILD_SAMPLE=ON ` - -DD3D12MA_AGILITY_SDK_DIRECTORY=$env:DX_AGILITY_SDK_URL ` + -DD3D12MA_AGILITY_SDK_DIRECTORY=$env:DX_AGILITY_SDK_PATH ` ${{ matrix.config.cmake_configure_options }} - name: Build From e72ffddef617468ecbf51728500bd38fed86a716 Mon Sep 17 00:00:00 2001 From: Adam Sawicki Date: Thu, 17 Apr 2025 12:19:18 +0200 Subject: [PATCH 6/9] Trying to fix the path to Agility SDK (2) --- .github/workflows/windows.yaml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/windows.yaml b/.github/workflows/windows.yaml index 0121da5..3118c64 100644 --- a/.github/workflows/windows.yaml +++ b/.github/workflows/windows.yaml @@ -39,9 +39,8 @@ jobs: shell: pwsh run: | $ProgressPreference = 'SilentlyContinue' - Invoke-WebRequest -Uri $env:DX_AGILITY_SDK_URL -OutFile "d3d12.zip" - Expand-Archive -Path "d3d12.zip" -DestinationPath "d3d12_sdk" - echo "DX_AGILITY_SDK_PATH=$env:GITHUB_WORKSPACE/d3d12_sdk" >> $env:GITHUB_ENV + Invoke-WebRequest -Uri $env:DX_AGILITY_SDK_URL -OutFile "agility_sdk.zip" + Expand-Archive -Path "agility_sdk.zip" -DestinationPath "agility_sdk" - name: Configure CMake shell: pwsh @@ -52,7 +51,7 @@ jobs: -Bbuild ` -DCMAKE_BUILD_TYPE=${{ matrix.config.build_type }} ` -DD3D12MA_BUILD_SAMPLE=ON ` - -DD3D12MA_AGILITY_SDK_DIRECTORY=$env:DX_AGILITY_SDK_PATH ` + -DD3D12MA_AGILITY_SDK_DIRECTORY=$env:GITHUB_WORKSPACE/agility_sdk ` ${{ matrix.config.cmake_configure_options }} - name: Build From 2d59f4f358b93eed2ac0fc71ddc33ddaedc26531 Mon Sep 17 00:00:00 2001 From: Adam Sawicki Date: Thu, 17 Apr 2025 12:23:18 +0200 Subject: [PATCH 7/9] Trying to fix the path to Agility SDK (3) --- .github/workflows/windows.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows.yaml b/.github/workflows/windows.yaml index 3118c64..804d36b 100644 --- a/.github/workflows/windows.yaml +++ b/.github/workflows/windows.yaml @@ -51,7 +51,7 @@ jobs: -Bbuild ` -DCMAKE_BUILD_TYPE=${{ matrix.config.build_type }} ` -DD3D12MA_BUILD_SAMPLE=ON ` - -DD3D12MA_AGILITY_SDK_DIRECTORY=$env:GITHUB_WORKSPACE/agility_sdk ` + -DD3D12MA_AGILITY_SDK_DIRECTORY=${$env:GITHUB_WORKSPACE}/agility_sdk ` ${{ matrix.config.cmake_configure_options }} - name: Build From 6aa0338bb6f957e745d54bc232fb1712b3c59fa3 Mon Sep 17 00:00:00 2001 From: Adam Sawicki Date: Thu, 17 Apr 2025 12:25:55 +0200 Subject: [PATCH 8/9] Trying to fix the path to Agility SDK (4) --- .github/workflows/windows.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/windows.yaml b/.github/workflows/windows.yaml index 804d36b..375a5df 100644 --- a/.github/workflows/windows.yaml +++ b/.github/workflows/windows.yaml @@ -47,11 +47,13 @@ jobs: run: | $env:CC="${{ matrix.config.cc }}" $env:CXX="${{ matrix.config.cxx }}" + $AGILITY_SDK_PATH = "$env:GITHUB_WORKSPACE/agility_sdk" + echo $AGILITY_SDK_PATH cmake . ` -Bbuild ` -DCMAKE_BUILD_TYPE=${{ matrix.config.build_type }} ` -DD3D12MA_BUILD_SAMPLE=ON ` - -DD3D12MA_AGILITY_SDK_DIRECTORY=${$env:GITHUB_WORKSPACE}/agility_sdk ` + -DD3D12MA_AGILITY_SDK_DIRECTORY="$AGILITY_SDK_PATH" ` ${{ matrix.config.cmake_configure_options }} - name: Build From fc894f27a3fdcc7c65e43741fc80aac68d17fa55 Mon Sep 17 00:00:00 2001 From: Adam Sawicki Date: Thu, 17 Apr 2025 12:32:55 +0200 Subject: [PATCH 9/9] Finished CI script, hopefully --- .github/workflows/windows.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/windows.yaml b/.github/workflows/windows.yaml index 375a5df..8edd3e8 100644 --- a/.github/workflows/windows.yaml +++ b/.github/workflows/windows.yaml @@ -23,13 +23,13 @@ jobs: cmake_configure_options: '-G "Visual Studio 17 2022" -A x64', build_type: "Debug", } - #- { - # name: "Windows MSVC (Release)", - # compiler: "msvc", - # cc: "cl", cxx: "cl", - # cmake_configure_options: '-G "Visual Studio 17 2022" -A x64', - # build_type: "Release", - #} + - { + name: "Windows MSVC (Release)", + compiler: "msvc", + cc: "cl", cxx: "cl", + cmake_configure_options: '-G "Visual Studio 17 2022" -A x64', + build_type: "Release", + } steps: - name: Checkout