From 6f6ff7a55e7fc2a58693fc4f86a9ae8cdfac6e87 Mon Sep 17 00:00:00 2001 From: Jean Philippe Date: Sun, 18 Aug 2024 15:16:08 +0100 Subject: [PATCH 01/33] published windows artifact --- .github/workflows/window-build.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/window-build.yml b/.github/workflows/window-build.yml index aea0d645..d70dde8c 100644 --- a/.github/workflows/window-build.yml +++ b/.github/workflows/window-build.yml @@ -33,6 +33,12 @@ jobs: run: .\Scripts\BuildEngine.ps1 -Configurations ${{matrix.buildConfiguration}} shell: pwsh + - name: Publish Artifacts + use: actions/upload-artifact@v2 + with: + name: Windows-x64 + path: Result.Windows.x64.MultiConfig + - name: Run Tests run: .\Scripts\RunTests.ps1 -Configurations ${{matrix.buildConfiguration}} shell: pwsh From 8957ba25b83d98a61d8af3e9d57ff664695c99c1 Mon Sep 17 00:00:00 2001 From: Jean Philippe Date: Sun, 18 Aug 2024 15:18:47 +0100 Subject: [PATCH 02/33] fixed typo --- .github/workflows/window-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/window-build.yml b/.github/workflows/window-build.yml index d70dde8c..1abb79bc 100644 --- a/.github/workflows/window-build.yml +++ b/.github/workflows/window-build.yml @@ -34,7 +34,7 @@ jobs: shell: pwsh - name: Publish Artifacts - use: actions/upload-artifact@v2 + uses: actions/upload-artifact@v2 with: name: Windows-x64 path: Result.Windows.x64.MultiConfig From a40b810d2c6c322f1bf976167e563150a0d72d96 Mon Sep 17 00:00:00 2001 From: Jean Philippe Date: Mon, 19 Aug 2024 00:34:44 +0100 Subject: [PATCH 03/33] fixed engine path --- .vscode/launch.json | 12 +++---- CMakeLists.txt | 6 ---- Panzerfaust/Service/Engine/EngineService.cs | 2 +- Scripts/PostBuild.ps1 | 38 +++++++++++++++++++++ 4 files changed, 45 insertions(+), 13 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index 1046d1b0..ccfa179c 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -7,7 +7,7 @@ "request": "launch", "program": "${workspaceFolder}/Result.Windows.x64.MultiConfig/Panzerfaust/Debug/net6.0/win-x64/publish/Panzerfaust.dll", "args": [], - "cwd": "${workspaceFolder}", + "cwd": "${workspaceFolder}/Result.Windows.x64.MultiConfig/Panzerfaust/Debug/net6.0/win-x64/publish", "stopAtEntry": false, "console": "internalConsole", }, @@ -17,7 +17,7 @@ "request": "launch", "program": "${workspaceFolder}/Result.Windows.x64.MultiConfig/Panzerfaust/Release/net6.0/win-x64/publish/Panzerfaust.dll", "args": [], - "cwd": "${workspaceFolder}", + "cwd": "${workspaceFolder}/Result.Windows.x64.MultiConfig/Panzerfaust/Release/net6.0/win-x64/publish", "stopAtEntry": false, "console": "internalConsole", }, @@ -27,7 +27,7 @@ "request": "launch", "program": "${workspaceFolder}/Result.Darwin.x64.Debug/Panzerfaust/Debug/net6.0/osx-x64/publish/Panzerfaust.dll", "args": [], - "cwd": "${workspaceFolder}", + "cwd": "${workspaceFolder}/Result.Darwin.x64.Debug/Panzerfaust/Debug/net6.0/osx-x64/publish", "stopAtEntry": false, "console": "internalConsole", }, @@ -37,7 +37,7 @@ "request": "launch", "program": "${workspaceFolder}/Result.Darwin.x64.Release/Panzerfaust/Release/net6.0/osx-x64/publish/Panzerfaust.dll", "args": [], - "cwd": "${workspaceFolder}", + "cwd": "${workspaceFolder}/Result.Darwin.x64.Release/Panzerfaust/Release/net6.0/osx-x64/publish", "stopAtEntry": false, "console": "internalConsole", }, @@ -47,7 +47,7 @@ "request": "launch", "program": "${workspaceFolder}/Result.Darwin.x64.Debug/Panzerfaust/Debug/net6.0/osx-arm64/publish/Panzerfaust.dll", "args": [], - "cwd": "${workspaceFolder}", + "cwd": "${workspaceFolder}/Result.Darwin.x64.Debug/Panzerfaust/Debug/net6.0/osx-arm64/publish", "stopAtEntry": false, "console": "internalConsole", }, @@ -57,7 +57,7 @@ "request": "launch", "program": "${workspaceFolder}/Result.Darwin.x64.Release/Panzerfaust/Release/net6.0/osx-arm64/publish/Panzerfaust.dll", "args": [], - "cwd": "${workspaceFolder}", + "cwd": "${workspaceFolder}/Result.Darwin.x64.Release/Panzerfaust/Release/net6.0/osx-arm64/publish", "stopAtEntry": false, "console": "internalConsole", } diff --git a/CMakeLists.txt b/CMakeLists.txt index d9d11f32..8b33f0fa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -108,9 +108,3 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows") else () add_dependencies(AssembleContent Panzerfaust) endif () - -# Copying Examples dir -# -if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/Examples/projectConfig.json) - file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/Examples/projectConfig.json DESTINATION ${CMAKE_BINARY_DIR}/Examples) -endif () diff --git a/Panzerfaust/Service/Engine/EngineService.cs b/Panzerfaust/Service/Engine/EngineService.cs index a88124eb..021fcc04 100644 --- a/Panzerfaust/Service/Engine/EngineService.cs +++ b/Panzerfaust/Service/Engine/EngineService.cs @@ -29,7 +29,7 @@ private void LoadConfig() { #if DEBUG configuration = "Debug"; - exampleProjectConfig = @$"{Environment.CurrentDirectory}/../../../Examples/projectConfig.json"; + exampleProjectConfig = @$"{Environment.CurrentDirectory}/Examples/projectConfig.json"; engineArgs.Add(exampleProjectConfig); #else configuration = "Release"; diff --git a/Scripts/PostBuild.ps1 b/Scripts/PostBuild.ps1 index da9e769a..dc843a8a 100644 --- a/Scripts/PostBuild.ps1 +++ b/Scripts/PostBuild.ps1 @@ -83,14 +83,17 @@ $ContentsToProcess = @( Contents = @( switch ($SystemName) { "Windows" { + @{ From = "$OuputBuildDirectory\Tetragrama\src\$Configurations"; To = "$OuputBuildDirectory\Panzerfaust\$Configurations\net6.0\Editor"} @{ From = "$OuputBuildDirectory\Tetragrama\src\$Configurations"; To = "$OuputBuildDirectory\Panzerfaust\$Configurations\net6.0\$Architectures\publish\Editor"} } "Darwin" { switch ($Architectures) { "osx-x64" { + @{ From = "$OuputBuildDirectory\Tetragrama\src\$Configurations"; To = "$OuputBuildDirectory\Panzerfaust\$Configurations\net6.0\$Architectures\Editor"} @{ From = "$OuputBuildDirectory\Tetragrama\src\$Configurations"; To = "$OuputBuildDirectory\Panzerfaust\$Configurations\net6.0\$Architectures\publish\Editor"} } "osx-arm64" { + @{ From = "$OuputBuildDirectory\Tetragrama\src\$Configurations"; To = "$OuputBuildDirectory\Panzerfaust\$Configurations\net6.0\$Architectures\Editor"} @{ From = "$OuputBuildDirectory\Tetragrama\src\$Configurations"; To = "$OuputBuildDirectory\Panzerfaust\$Configurations\net6.0\$Architectures\publish\Editor"} } Default { @@ -106,6 +109,41 @@ $ContentsToProcess = @( } } ) + }, + @{ + Name = "Examples" + IsDirectory = $true + Contents = @( + if ($Configurations -eq "Debug") { + switch ($SystemName) { + "Windows" { + @{ From = "$RepoRoot\Examples"; To = "$OuputBuildDirectory\Panzerfaust\$Configurations\net6.0\Examples"} + @{ From = "$RepoRoot\Examples"; To = "$OuputBuildDirectory\Panzerfaust\$Configurations\net6.0\$Architectures\publish\Examples"} + } + "Darwin" { + switch ($Architectures) { + "osx-x64" { + @{ From = "$RepoRoot\Examples"; To = "$OuputBuildDirectory\Panzerfaust\$Configurations\net6.0\$Architectures\publish\Examples"} + @{ From = "$RepoRoot\Examples"; To = "$OuputBuildDirectory\Panzerfaust\$Configurations\net6.0\$Architectures\Examples"} + } + "osx-arm64" { + @{ From = "$RepoRoot\Examples"; To = "$OuputBuildDirectory\Panzerfaust\$Configurations\net6.0\$Architectures\publish\Examples"} + @{ From = "$RepoRoot\Examples"; To = "$OuputBuildDirectory\Panzerfaust\$Configurations\net6.0\$Architectures\Examples"} + } + Default { + throw 'This architecture is not supported' + } + } + } + "Linux" { + @{ From = "$RepoRoot\Examples"; To = "$OuputBuildDirectory\Panzerfaust\$Configurations\net6.0\Examples"} + } + Default { + throw 'This system is not supported' + } + } + } + ) } ) From 4278f2912bd31f6187f51369dfe79b353839c17c Mon Sep 17 00:00:00 2001 From: Jean Philippe Date: Mon, 19 Aug 2024 22:05:23 +0100 Subject: [PATCH 04/33] templating CI build --- .github/workflows/Engine-CI.yml | 15 +++++ .../templates/job-cmakebuild-windows.yml | 22 ++++++++ .../templates/job-deploy-windows.yml | 17 ++++++ .../workflows/templates/job-test-windows.yml | 29 ++++++++++ .github/workflows/window-build.yml | 55 ++++++------------- 5 files changed, 100 insertions(+), 38 deletions(-) create mode 100644 .github/workflows/Engine-CI.yml create mode 100644 .github/workflows/templates/job-cmakebuild-windows.yml create mode 100644 .github/workflows/templates/job-deploy-windows.yml create mode 100644 .github/workflows/templates/job-test-windows.yml diff --git a/.github/workflows/Engine-CI.yml b/.github/workflows/Engine-CI.yml new file mode 100644 index 00000000..36c728c9 --- /dev/null +++ b/.github/workflows/Engine-CI.yml @@ -0,0 +1,15 @@ +on: + push: + branches: [ master, develop ] + pull_request: + branches: [ master, develop ] + +jobs: + windows: + uses: ./.github/workflows/windows-build.yml + + macOS: + uses: ./.github/workflows/macOS-build.yml + + linux: + uses: ./.github/workflows/linux-build.yml \ No newline at end of file diff --git a/.github/workflows/templates/job-cmakebuild-windows.yml b/.github/workflows/templates/job-cmakebuild-windows.yml new file mode 100644 index 00000000..1eddf381 --- /dev/null +++ b/.github/workflows/templates/job-cmakebuild-windows.yml @@ -0,0 +1,22 @@ +# CMake build of ZEngine for Windows +# +name: Build Workflow + +on: + workflow_call: + inputs: + configuration: + type: string + default: 'Debug' + +jobs: + cmake-build: + runs-on: windows-2022 + + steps: + - name: Checkout repository + uses: actions/checkout@v3 + + - name: CMake Build + run: .\Scripts\BuildEngine.ps1 -Configurations ${{input.configuration}} + shell: pwsh diff --git a/.github/workflows/templates/job-deploy-windows.yml b/.github/workflows/templates/job-deploy-windows.yml new file mode 100644 index 00000000..43046754 --- /dev/null +++ b/.github/workflows/templates/job-deploy-windows.yml @@ -0,0 +1,17 @@ +# Deploy for Windows +# +name: Deploy Workflow + +jobs: + test: + runs-on: windows-2022 + + steps: + - name: Checkout repository + uses: actions/checkout@v3 + + - name: Publish Artifacts + uses: actions/upload-artifact@v2 + with: + name: Windows-x64 + path: Result.Windows.x64.MultiConfig diff --git a/.github/workflows/templates/job-test-windows.yml b/.github/workflows/templates/job-test-windows.yml new file mode 100644 index 00000000..8ff8345f --- /dev/null +++ b/.github/workflows/templates/job-test-windows.yml @@ -0,0 +1,29 @@ +# Run tests for Windows +# +name: Test Workflow + +on: + workflow_call: + inputs: + configuration: + type: string + default: 'Debug' + +jobs: + test: + runs-on: windows-2022 + + steps: + - name: Checkout repository + uses: actions/checkout@v3 + + - name: Install Vulkan SDK + uses: humbletim/setup-vulkan-sdk@v1.2.0 + with: + vulkan-query-version: 1.3.204.0 + vulkan-components: Vulkan-Headers, Vulkan-Loader + vulkan-use-cache: true + + - name: Run Tests + run: .\Scripts\RunTests.ps1 -Configurations ${{inputs.configuration}} + shell: pwsh diff --git a/.github/workflows/window-build.yml b/.github/workflows/window-build.yml index 1abb79bc..bd46f38f 100644 --- a/.github/workflows/window-build.yml +++ b/.github/workflows/window-build.yml @@ -1,44 +1,23 @@ name: ZEngine Window Build -on: - push: - branches: [ master, develop ] - pull_request: - branches: [ master, develop ] - jobs: - Windows-Build: - runs-on: windows-2022 + cmake-build: strategy: matrix: - buildConfiguration: [Debug, Release] - - steps: - - name: Checkout repository - uses: actions/checkout@v3 - - - name: Install Vulkan SDK - uses: humbletim/setup-vulkan-sdk@v1.2.0 - with: - vulkan-query-version: 1.3.204.0 - vulkan-components: Vulkan-Headers, Vulkan-Loader - vulkan-use-cache: true - - - name: Install CMake - uses: jwlawson/actions-setup-cmake@v2 - with: - cmake-version: '3.21.x' + buildConfiguration: [Debug, Release] + uses: ./.github/workflows/templates/job-cmakebuild-windows.yml + with: + configuration: ${{matrix.buildConfiguration}} - - name: CMake Build - run: .\Scripts\BuildEngine.ps1 -Configurations ${{matrix.buildConfiguration}} - shell: pwsh - - - name: Publish Artifacts - uses: actions/upload-artifact@v2 - with: - name: Windows-x64 - path: Result.Windows.x64.MultiConfig - - - name: Run Tests - run: .\Scripts\RunTests.ps1 -Configurations ${{matrix.buildConfiguration}} - shell: pwsh + test: + needs: cmake-build + strategy: + matrix: + testConfiguration: [Debug, Release] + uses: ./.github/workflows/templates/job-test-windows.yml + with: + configuration: ${{matrix.testConfiguration}} + + deploy: + needs: test + uses: ./.github/workflows/templates/job-deploy-windows.yml \ No newline at end of file From 4950a0661dc1729c7f66e3916bbb8460fb7f686c Mon Sep 17 00:00:00 2001 From: Jean Philippe Date: Mon, 19 Aug 2024 22:08:59 +0100 Subject: [PATCH 05/33] fixed CI --- .github/workflows/Engine-CI.yml | 4 ++-- .github/workflows/macOS-build.yml | 6 ------ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/Engine-CI.yml b/.github/workflows/Engine-CI.yml index 36c728c9..71c27072 100644 --- a/.github/workflows/Engine-CI.yml +++ b/.github/workflows/Engine-CI.yml @@ -11,5 +11,5 @@ jobs: macOS: uses: ./.github/workflows/macOS-build.yml - linux: - uses: ./.github/workflows/linux-build.yml \ No newline at end of file + # linux: + # uses: ./.github/workflows/linux-build.yml \ No newline at end of file diff --git a/.github/workflows/macOS-build.yml b/.github/workflows/macOS-build.yml index eee25681..516863ff 100644 --- a/.github/workflows/macOS-build.yml +++ b/.github/workflows/macOS-build.yml @@ -1,11 +1,5 @@ name: ZEngine macOS Build -on: - push: - branches: [ master, develop ] - pull_request: - branches: [ master, develop ] - jobs: macOS-Intel-Build: runs-on: macos-13 From 5b69b0ad8bdf0c723ef548209f02bc326d1e941b Mon Sep 17 00:00:00 2001 From: Jean Philippe Date: Mon, 19 Aug 2024 22:14:43 +0100 Subject: [PATCH 06/33] fixed workflow call --- .github/workflows/macOS-build.yml | 2 ++ .github/workflows/window-build.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.github/workflows/macOS-build.yml b/.github/workflows/macOS-build.yml index 516863ff..be41e00b 100644 --- a/.github/workflows/macOS-build.yml +++ b/.github/workflows/macOS-build.yml @@ -1,5 +1,7 @@ name: ZEngine macOS Build +on: workflow_call + jobs: macOS-Intel-Build: runs-on: macos-13 diff --git a/.github/workflows/window-build.yml b/.github/workflows/window-build.yml index bd46f38f..88002dd7 100644 --- a/.github/workflows/window-build.yml +++ b/.github/workflows/window-build.yml @@ -1,5 +1,7 @@ name: ZEngine Window Build +on: workflow_call + jobs: cmake-build: strategy: From efd3df4f9274a154bcc9d28ca541825f05028f70 Mon Sep 17 00:00:00 2001 From: Jean Philippe Date: Mon, 19 Aug 2024 22:17:30 +0100 Subject: [PATCH 07/33] fixed workflow name --- .github/workflows/{window-build.yml => windows-build.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{window-build.yml => windows-build.yml} (100%) diff --git a/.github/workflows/window-build.yml b/.github/workflows/windows-build.yml similarity index 100% rename from .github/workflows/window-build.yml rename to .github/workflows/windows-build.yml From b814f2aa2684bb27e3d87023a94abf7880deb592 Mon Sep 17 00:00:00 2001 From: Jean Philippe Date: Mon, 19 Aug 2024 22:20:43 +0100 Subject: [PATCH 08/33] attempt to fix workflow path --- .github/workflows/Engine-CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Engine-CI.yml b/.github/workflows/Engine-CI.yml index 71c27072..68293285 100644 --- a/.github/workflows/Engine-CI.yml +++ b/.github/workflows/Engine-CI.yml @@ -6,7 +6,7 @@ on: jobs: windows: - uses: ./.github/workflows/windows-build.yml + uses: .github/workflows/windows-build.yml macOS: uses: ./.github/workflows/macOS-build.yml From 69aaf216b9219f41c58fa740211668913a777617 Mon Sep 17 00:00:00 2001 From: Jean Philippe Date: Mon, 19 Aug 2024 22:25:25 +0100 Subject: [PATCH 09/33] dummy linux build --- .github/workflows/linux-build.yml | 38 +++++++++++++++---------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml index fb67eb01..927ddaa3 100644 --- a/.github/workflows/linux-build.yml +++ b/.github/workflows/linux-build.yml @@ -1,24 +1,24 @@ # @JeanPhilippeKernel : Disabled because we only support Windows as platform for now # -# name: ZEngine Linux Build - -# on: -# push: -# branches: [ master, develop ] -# pull_request: -# branches: [ master, develop ] - -# jobs: -# Linux-Build: -# runs-on: ubuntu-latest -# strategy: -# matrix: -# buildConfiguration: [Debug, Release] - -# steps: -# - name: Checkout repository -# uses: actions/checkout@v2 - +name: ZEngine Linux Build + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +jobs: + Linux-Build: + runs-on: ubuntu-latest + strategy: + matrix: + buildConfiguration: [Debug, Release] + + steps: + - name: Checkout repository + uses: actions/checkout@v2 + # - name: Checkout submodules # run: git submodule update --init --recursive From 92256d600997a8baf17111253cae6b3cb0c7ab93 Mon Sep 17 00:00:00 2001 From: Jean Philippe Date: Mon, 19 Aug 2024 22:27:04 +0100 Subject: [PATCH 10/33] fixed window workflow path --- .github/workflows/windows-build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml index 88002dd7..3f23d236 100644 --- a/.github/workflows/windows-build.yml +++ b/.github/workflows/windows-build.yml @@ -7,7 +7,7 @@ jobs: strategy: matrix: buildConfiguration: [Debug, Release] - uses: ./.github/workflows/templates/job-cmakebuild-windows.yml + uses: .github/workflows/templates/job-cmakebuild-windows.yml with: configuration: ${{matrix.buildConfiguration}} @@ -16,10 +16,10 @@ jobs: strategy: matrix: testConfiguration: [Debug, Release] - uses: ./.github/workflows/templates/job-test-windows.yml + uses: .github/workflows/templates/job-test-windows.yml with: configuration: ${{matrix.testConfiguration}} deploy: needs: test - uses: ./.github/workflows/templates/job-deploy-windows.yml \ No newline at end of file + uses: .github/workflows/templates/job-deploy-windows.yml \ No newline at end of file From 646abf6f616fdfa2a92e2ff24f9c193ff9e1c71c Mon Sep 17 00:00:00 2001 From: Jean Philippe Date: Mon, 19 Aug 2024 23:01:26 +0100 Subject: [PATCH 11/33] added version --- .github/workflows/windows-build.yml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml index 3f23d236..56471195 100644 --- a/.github/workflows/windows-build.yml +++ b/.github/workflows/windows-build.yml @@ -1,13 +1,17 @@ name: ZEngine Window Build -on: workflow_call - +on: + workflow_call: + inputs: + version_file: + type: string + default: '1' jobs: cmake-build: strategy: matrix: buildConfiguration: [Debug, Release] - uses: .github/workflows/templates/job-cmakebuild-windows.yml + uses: .github/workflows/templates/job-cmakebuild-windows.yml@v${{inputs.version_file}} with: configuration: ${{matrix.buildConfiguration}} @@ -16,10 +20,10 @@ jobs: strategy: matrix: testConfiguration: [Debug, Release] - uses: .github/workflows/templates/job-test-windows.yml + uses: .github/workflows/templates/job-test-windows.yml@v${{inputs.version_file}} with: configuration: ${{matrix.testConfiguration}} deploy: needs: test - uses: .github/workflows/templates/job-deploy-windows.yml \ No newline at end of file + uses: .github/workflows/templates/job-deploy-windows.yml@v${{inputs.version_file}} \ No newline at end of file From 5cba53b6ec6f3e914c904aacc546289e3a701353 Mon Sep 17 00:00:00 2001 From: Jean Philippe Date: Mon, 19 Aug 2024 23:07:16 +0100 Subject: [PATCH 12/33] added version --- .github/workflows/Engine-CI.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/Engine-CI.yml b/.github/workflows/Engine-CI.yml index 68293285..87e17fc7 100644 --- a/.github/workflows/Engine-CI.yml +++ b/.github/workflows/Engine-CI.yml @@ -6,10 +6,10 @@ on: jobs: windows: - uses: .github/workflows/windows-build.yml + uses: .github/workflows/windows-build.yml@v1 macOS: - uses: ./.github/workflows/macOS-build.yml + uses: ./.github/workflows/macOS-build.yml@v1 # linux: # uses: ./.github/workflows/linux-build.yml \ No newline at end of file From c48740e0aaad71a92181942704a83ae4a3f70e94 Mon Sep 17 00:00:00 2001 From: Jean Philippe Date: Mon, 19 Aug 2024 23:09:51 +0100 Subject: [PATCH 13/33] reworked files --- .../workflows/{templates => }/job-cmakebuild-windows.yml | 0 .github/workflows/{templates => }/job-deploy-windows.yml | 0 .github/workflows/{templates => }/job-test-windows.yml | 0 .github/workflows/windows-build.yml | 6 +++--- 4 files changed, 3 insertions(+), 3 deletions(-) rename .github/workflows/{templates => }/job-cmakebuild-windows.yml (100%) rename .github/workflows/{templates => }/job-deploy-windows.yml (100%) rename .github/workflows/{templates => }/job-test-windows.yml (100%) diff --git a/.github/workflows/templates/job-cmakebuild-windows.yml b/.github/workflows/job-cmakebuild-windows.yml similarity index 100% rename from .github/workflows/templates/job-cmakebuild-windows.yml rename to .github/workflows/job-cmakebuild-windows.yml diff --git a/.github/workflows/templates/job-deploy-windows.yml b/.github/workflows/job-deploy-windows.yml similarity index 100% rename from .github/workflows/templates/job-deploy-windows.yml rename to .github/workflows/job-deploy-windows.yml diff --git a/.github/workflows/templates/job-test-windows.yml b/.github/workflows/job-test-windows.yml similarity index 100% rename from .github/workflows/templates/job-test-windows.yml rename to .github/workflows/job-test-windows.yml diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml index 56471195..39c980f4 100644 --- a/.github/workflows/windows-build.yml +++ b/.github/workflows/windows-build.yml @@ -11,7 +11,7 @@ jobs: strategy: matrix: buildConfiguration: [Debug, Release] - uses: .github/workflows/templates/job-cmakebuild-windows.yml@v${{inputs.version_file}} + uses: .github/workflows/job-cmakebuild-windows.yml@v${{inputs.version_file}} with: configuration: ${{matrix.buildConfiguration}} @@ -20,10 +20,10 @@ jobs: strategy: matrix: testConfiguration: [Debug, Release] - uses: .github/workflows/templates/job-test-windows.yml@v${{inputs.version_file}} + uses: .github/workflows/job-test-windows.yml@v${{inputs.version_file}} with: configuration: ${{matrix.testConfiguration}} deploy: needs: test - uses: .github/workflows/templates/job-deploy-windows.yml@v${{inputs.version_file}} \ No newline at end of file + uses: .github/workflows/job-deploy-windows.yml@v${{inputs.version_file}} \ No newline at end of file From 4d959137bc3920dcf77d9500c5dd9deba9e25cdd Mon Sep 17 00:00:00 2001 From: Jean Philippe Date: Mon, 19 Aug 2024 23:11:58 +0100 Subject: [PATCH 14/33] updated refs --- .github/workflows/Engine-CI.yml | 2 +- .github/workflows/windows-build.yml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/Engine-CI.yml b/.github/workflows/Engine-CI.yml index 87e17fc7..376aac4c 100644 --- a/.github/workflows/Engine-CI.yml +++ b/.github/workflows/Engine-CI.yml @@ -6,7 +6,7 @@ on: jobs: windows: - uses: .github/workflows/windows-build.yml@v1 + uses: ./.github/workflows/windows-build.yml@v1 macOS: uses: ./.github/workflows/macOS-build.yml@v1 diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml index 39c980f4..105259ed 100644 --- a/.github/workflows/windows-build.yml +++ b/.github/workflows/windows-build.yml @@ -11,7 +11,7 @@ jobs: strategy: matrix: buildConfiguration: [Debug, Release] - uses: .github/workflows/job-cmakebuild-windows.yml@v${{inputs.version_file}} + uses: ./.github/workflows/job-cmakebuild-windows.yml@v${{inputs.version_file}} with: configuration: ${{matrix.buildConfiguration}} @@ -20,10 +20,10 @@ jobs: strategy: matrix: testConfiguration: [Debug, Release] - uses: .github/workflows/job-test-windows.yml@v${{inputs.version_file}} + uses: ./.github/workflows/job-test-windows.yml@v${{inputs.version_file}} with: configuration: ${{matrix.testConfiguration}} deploy: needs: test - uses: .github/workflows/job-deploy-windows.yml@v${{inputs.version_file}} \ No newline at end of file + uses: ./.github/workflows/job-deploy-windows.yml@v${{inputs.version_file}} \ No newline at end of file From 0bf6e11eadf87b3a8ab16461b288d956a5bb5597 Mon Sep 17 00:00:00 2001 From: Jean Philippe Date: Mon, 19 Aug 2024 23:14:12 +0100 Subject: [PATCH 15/33] fixed versions --- .github/workflows/job-deploy-windows.yml | 2 ++ .github/workflows/windows-build.yml | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/job-deploy-windows.yml b/.github/workflows/job-deploy-windows.yml index 43046754..2bbe9f25 100644 --- a/.github/workflows/job-deploy-windows.yml +++ b/.github/workflows/job-deploy-windows.yml @@ -2,6 +2,8 @@ # name: Deploy Workflow +on: workflow_call + jobs: test: runs-on: windows-2022 diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml index 105259ed..c3b486ec 100644 --- a/.github/workflows/windows-build.yml +++ b/.github/workflows/windows-build.yml @@ -11,7 +11,7 @@ jobs: strategy: matrix: buildConfiguration: [Debug, Release] - uses: ./.github/workflows/job-cmakebuild-windows.yml@v${{inputs.version_file}} + uses: ./.github/workflows/job-cmakebuild-windows.yml with: configuration: ${{matrix.buildConfiguration}} @@ -20,10 +20,10 @@ jobs: strategy: matrix: testConfiguration: [Debug, Release] - uses: ./.github/workflows/job-test-windows.yml@v${{inputs.version_file}} + uses: ./.github/workflows/job-test-windows.yml with: configuration: ${{matrix.testConfiguration}} deploy: needs: test - uses: ./.github/workflows/job-deploy-windows.yml@v${{inputs.version_file}} \ No newline at end of file + uses: ./.github/workflows/job-deploy-windows.yml \ No newline at end of file From df75fb9200f6bb0a744e9689501a1e0aa262d3fd Mon Sep 17 00:00:00 2001 From: Jean Philippe Date: Mon, 19 Aug 2024 23:14:59 +0100 Subject: [PATCH 16/33] removed versions --- .github/workflows/Engine-CI.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/Engine-CI.yml b/.github/workflows/Engine-CI.yml index 376aac4c..71c27072 100644 --- a/.github/workflows/Engine-CI.yml +++ b/.github/workflows/Engine-CI.yml @@ -6,10 +6,10 @@ on: jobs: windows: - uses: ./.github/workflows/windows-build.yml@v1 + uses: ./.github/workflows/windows-build.yml macOS: - uses: ./.github/workflows/macOS-build.yml@v1 + uses: ./.github/workflows/macOS-build.yml # linux: # uses: ./.github/workflows/linux-build.yml \ No newline at end of file From 2c1681db4d731ecf04233925734d9e2c2ba8de9b Mon Sep 17 00:00:00 2001 From: Jean Philippe Date: Mon, 19 Aug 2024 23:16:51 +0100 Subject: [PATCH 17/33] fixed typo --- .github/workflows/job-cmakebuild-windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/job-cmakebuild-windows.yml b/.github/workflows/job-cmakebuild-windows.yml index 1eddf381..4a604029 100644 --- a/.github/workflows/job-cmakebuild-windows.yml +++ b/.github/workflows/job-cmakebuild-windows.yml @@ -18,5 +18,5 @@ jobs: uses: actions/checkout@v3 - name: CMake Build - run: .\Scripts\BuildEngine.ps1 -Configurations ${{input.configuration}} + run: .\Scripts\BuildEngine.ps1 -Configurations ${{inputs.configuration}} shell: pwsh From a7557d9fd216cc6f90c44b85f29bb4bea015a387 Mon Sep 17 00:00:00 2001 From: Jean Philippe Date: Mon, 19 Aug 2024 23:24:26 +0100 Subject: [PATCH 18/33] fixed job name --- .github/workflows/job-deploy-windows.yml | 2 +- .github/workflows/windows-build.yml | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/.github/workflows/job-deploy-windows.yml b/.github/workflows/job-deploy-windows.yml index 2bbe9f25..d7218cc3 100644 --- a/.github/workflows/job-deploy-windows.yml +++ b/.github/workflows/job-deploy-windows.yml @@ -5,7 +5,7 @@ name: Deploy Workflow on: workflow_call jobs: - test: + deploy: runs-on: windows-2022 steps: diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml index c3b486ec..01397c7e 100644 --- a/.github/workflows/windows-build.yml +++ b/.github/workflows/windows-build.yml @@ -1,11 +1,7 @@ name: ZEngine Window Build -on: - workflow_call: - inputs: - version_file: - type: string - default: '1' +on: workflow_call + jobs: cmake-build: strategy: From 404edd083c3f96b71d16a5a7c9186d35024a4970 Mon Sep 17 00:00:00 2001 From: Jean Philippe Date: Tue, 20 Aug 2024 00:13:29 +0100 Subject: [PATCH 19/33] fixed publish artifacts --- .github/workflows/job-cmakebuild-windows.yml | 16 +++++++++++++++- .github/workflows/job-test-windows.yml | 7 ++++++- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/.github/workflows/job-cmakebuild-windows.yml b/.github/workflows/job-cmakebuild-windows.yml index 4a604029..92934e25 100644 --- a/.github/workflows/job-cmakebuild-windows.yml +++ b/.github/workflows/job-cmakebuild-windows.yml @@ -10,7 +10,7 @@ on: default: 'Debug' jobs: - cmake-build: + cmake-build-windows-${{inputs.configuration}}: runs-on: windows-2022 steps: @@ -20,3 +20,17 @@ jobs: - name: CMake Build run: .\Scripts\BuildEngine.ps1 -Configurations ${{inputs.configuration}} shell: pwsh + + - name: Publish Build Artifacts + uses: actions/upload-artifact@v4 + with: + name: Windows-x64 + path: | + Result.Windows.x64.MultiConfig/Panzerfaust/${{inputs.configuration}}/net6.0/ + Result.Windows.x64.MultiConfig/ZEngine/tests/${{inputs.configuration}}/ + !Result.Windows.x64.MultiConfig/Panzerfaust/${{inputs.configuration}}/net6.0/**/Microsoft.CodeAnalysis.CSharp.resources.dll + !Result.Windows.x64.MultiConfig/Panzerfaust/${{inputs.configuration}}/net6.0/**/Microsoft.CodeAnalysis.CSharp.Scripting.resources.dll + !Result.Windows.x64.MultiConfig/Panzerfaust/${{inputs.configuration}}/net6.0/**/Microsoft.CodeAnalysis.resources.dll + !Result.Windows.x64.MultiConfig/Panzerfaust/${{inputs.configuration}}/net6.0/**/Microsoft.CodeAnalysis.Scripting.resources.dll + !Result.Windows.x64.MultiConfig/Panzerfaust/${{inputs.configuration}}/net6.0/runtimes/ + !Result.Windows.x64.MultiConfig/Panzerfaust/${{inputs.configuration}}/net6.0/**/createdump.exe diff --git a/.github/workflows/job-test-windows.yml b/.github/workflows/job-test-windows.yml index 8ff8345f..9de208fc 100644 --- a/.github/workflows/job-test-windows.yml +++ b/.github/workflows/job-test-windows.yml @@ -10,13 +10,18 @@ on: default: 'Debug' jobs: - test: + test-windows-${{inputs.configuration}}: runs-on: windows-2022 steps: - name: Checkout repository uses: actions/checkout@v3 + - uses: actions/download-artifact@v4 + with: + name: Windows-x64 + path: Result.Windows.x64.MultiConfig + - name: Install Vulkan SDK uses: humbletim/setup-vulkan-sdk@v1.2.0 with: From 6b67b06e98f603afb1e2ec433622d08cef5d5d8e Mon Sep 17 00:00:00 2001 From: Jean Philippe Date: Tue, 20 Aug 2024 00:18:18 +0100 Subject: [PATCH 20/33] fixed job name --- .github/workflows/job-cmakebuild-windows.yml | 43 ++++++++++---------- .github/workflows/job-test-windows.yml | 37 ++++++++--------- 2 files changed, 39 insertions(+), 41 deletions(-) diff --git a/.github/workflows/job-cmakebuild-windows.yml b/.github/workflows/job-cmakebuild-windows.yml index 92934e25..17f4c8c1 100644 --- a/.github/workflows/job-cmakebuild-windows.yml +++ b/.github/workflows/job-cmakebuild-windows.yml @@ -10,27 +10,26 @@ on: default: 'Debug' jobs: - cmake-build-windows-${{inputs.configuration}}: - runs-on: windows-2022 + name: cmake-build-windows-${{inputs.configuration}} + runs-on: windows-2022 + steps: + - name: Checkout repository + uses: actions/checkout@v3 - steps: - - name: Checkout repository - uses: actions/checkout@v3 + - name: CMake Build + run: .\Scripts\BuildEngine.ps1 -Configurations ${{inputs.configuration}} + shell: pwsh - - name: CMake Build - run: .\Scripts\BuildEngine.ps1 -Configurations ${{inputs.configuration}} - shell: pwsh - - - name: Publish Build Artifacts - uses: actions/upload-artifact@v4 - with: - name: Windows-x64 - path: | - Result.Windows.x64.MultiConfig/Panzerfaust/${{inputs.configuration}}/net6.0/ - Result.Windows.x64.MultiConfig/ZEngine/tests/${{inputs.configuration}}/ - !Result.Windows.x64.MultiConfig/Panzerfaust/${{inputs.configuration}}/net6.0/**/Microsoft.CodeAnalysis.CSharp.resources.dll - !Result.Windows.x64.MultiConfig/Panzerfaust/${{inputs.configuration}}/net6.0/**/Microsoft.CodeAnalysis.CSharp.Scripting.resources.dll - !Result.Windows.x64.MultiConfig/Panzerfaust/${{inputs.configuration}}/net6.0/**/Microsoft.CodeAnalysis.resources.dll - !Result.Windows.x64.MultiConfig/Panzerfaust/${{inputs.configuration}}/net6.0/**/Microsoft.CodeAnalysis.Scripting.resources.dll - !Result.Windows.x64.MultiConfig/Panzerfaust/${{inputs.configuration}}/net6.0/runtimes/ - !Result.Windows.x64.MultiConfig/Panzerfaust/${{inputs.configuration}}/net6.0/**/createdump.exe + - name: Publish Build Artifacts + uses: actions/upload-artifact@v4 + with: + name: Windows-x64 + path: | + Result.Windows.x64.MultiConfig/Panzerfaust/${{inputs.configuration}}/net6.0/ + Result.Windows.x64.MultiConfig/ZEngine/tests/${{inputs.configuration}}/ + !Result.Windows.x64.MultiConfig/Panzerfaust/${{inputs.configuration}}/net6.0/**/Microsoft.CodeAnalysis.CSharp.resources.dll + !Result.Windows.x64.MultiConfig/Panzerfaust/${{inputs.configuration}}/net6.0/**/Microsoft.CodeAnalysis.CSharp.Scripting.resources.dll + !Result.Windows.x64.MultiConfig/Panzerfaust/${{inputs.configuration}}/net6.0/**/Microsoft.CodeAnalysis.resources.dll + !Result.Windows.x64.MultiConfig/Panzerfaust/${{inputs.configuration}}/net6.0/**/Microsoft.CodeAnalysis.Scripting.resources.dll + !Result.Windows.x64.MultiConfig/Panzerfaust/${{inputs.configuration}}/net6.0/runtimes/ + !Result.Windows.x64.MultiConfig/Panzerfaust/${{inputs.configuration}}/net6.0/**/createdump.exe diff --git a/.github/workflows/job-test-windows.yml b/.github/workflows/job-test-windows.yml index 9de208fc..c7c81359 100644 --- a/.github/workflows/job-test-windows.yml +++ b/.github/workflows/job-test-windows.yml @@ -10,25 +10,24 @@ on: default: 'Debug' jobs: - test-windows-${{inputs.configuration}}: - runs-on: windows-2022 + name: test-windows-${{inputs.configuration}} + runs-on: windows-2022 + steps: + - name: Checkout repository + uses: actions/checkout@v3 - steps: - - name: Checkout repository - uses: actions/checkout@v3 + - uses: actions/download-artifact@v4 + with: + name: Windows-x64 + path: Result.Windows.x64.MultiConfig - - uses: actions/download-artifact@v4 - with: - name: Windows-x64 - path: Result.Windows.x64.MultiConfig + - name: Install Vulkan SDK + uses: humbletim/setup-vulkan-sdk@v1.2.0 + with: + vulkan-query-version: 1.3.204.0 + vulkan-components: Vulkan-Headers, Vulkan-Loader + vulkan-use-cache: true - - name: Install Vulkan SDK - uses: humbletim/setup-vulkan-sdk@v1.2.0 - with: - vulkan-query-version: 1.3.204.0 - vulkan-components: Vulkan-Headers, Vulkan-Loader - vulkan-use-cache: true - - - name: Run Tests - run: .\Scripts\RunTests.ps1 -Configurations ${{inputs.configuration}} - shell: pwsh + - name: Run Tests + run: .\Scripts\RunTests.ps1 -Configurations ${{inputs.configuration}} + shell: pwsh From 0a7d3bf8916bf3d961d7f7f6d949c0612c7e42f8 Mon Sep 17 00:00:00 2001 From: Jean Philippe Date: Tue, 20 Aug 2024 00:21:32 +0100 Subject: [PATCH 21/33] fixed format --- .github/workflows/job-cmakebuild-windows.yml | 36 ++++++++++---------- .github/workflows/job-test-windows.yml | 30 ++++++++-------- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/.github/workflows/job-cmakebuild-windows.yml b/.github/workflows/job-cmakebuild-windows.yml index 17f4c8c1..5d63b235 100644 --- a/.github/workflows/job-cmakebuild-windows.yml +++ b/.github/workflows/job-cmakebuild-windows.yml @@ -13,23 +13,23 @@ jobs: name: cmake-build-windows-${{inputs.configuration}} runs-on: windows-2022 steps: - - name: Checkout repository - uses: actions/checkout@v3 + - name: Checkout repository + uses: actions/checkout@v3 - - name: CMake Build - run: .\Scripts\BuildEngine.ps1 -Configurations ${{inputs.configuration}} - shell: pwsh + - name: CMake Build + run: .\Scripts\BuildEngine.ps1 -Configurations ${{inputs.configuration}} + shell: pwsh - - name: Publish Build Artifacts - uses: actions/upload-artifact@v4 - with: - name: Windows-x64 - path: | - Result.Windows.x64.MultiConfig/Panzerfaust/${{inputs.configuration}}/net6.0/ - Result.Windows.x64.MultiConfig/ZEngine/tests/${{inputs.configuration}}/ - !Result.Windows.x64.MultiConfig/Panzerfaust/${{inputs.configuration}}/net6.0/**/Microsoft.CodeAnalysis.CSharp.resources.dll - !Result.Windows.x64.MultiConfig/Panzerfaust/${{inputs.configuration}}/net6.0/**/Microsoft.CodeAnalysis.CSharp.Scripting.resources.dll - !Result.Windows.x64.MultiConfig/Panzerfaust/${{inputs.configuration}}/net6.0/**/Microsoft.CodeAnalysis.resources.dll - !Result.Windows.x64.MultiConfig/Panzerfaust/${{inputs.configuration}}/net6.0/**/Microsoft.CodeAnalysis.Scripting.resources.dll - !Result.Windows.x64.MultiConfig/Panzerfaust/${{inputs.configuration}}/net6.0/runtimes/ - !Result.Windows.x64.MultiConfig/Panzerfaust/${{inputs.configuration}}/net6.0/**/createdump.exe + - name: Publish Build Artifacts + uses: actions/upload-artifact@v4 + with: + name: Windows-x64 + path: | + Result.Windows.x64.MultiConfig/Panzerfaust/${{inputs.configuration}}/net6.0/ + Result.Windows.x64.MultiConfig/ZEngine/tests/${{inputs.configuration}}/ + !Result.Windows.x64.MultiConfig/Panzerfaust/${{inputs.configuration}}/net6.0/**/Microsoft.CodeAnalysis.CSharp.resources.dll + !Result.Windows.x64.MultiConfig/Panzerfaust/${{inputs.configuration}}/net6.0/**/Microsoft.CodeAnalysis.CSharp.Scripting.resources.dll + !Result.Windows.x64.MultiConfig/Panzerfaust/${{inputs.configuration}}/net6.0/**/Microsoft.CodeAnalysis.resources.dll + !Result.Windows.x64.MultiConfig/Panzerfaust/${{inputs.configuration}}/net6.0/**/Microsoft.CodeAnalysis.Scripting.resources.dll + !Result.Windows.x64.MultiConfig/Panzerfaust/${{inputs.configuration}}/net6.0/runtimes/ + !Result.Windows.x64.MultiConfig/Panzerfaust/${{inputs.configuration}}/net6.0/**/createdump.exe diff --git a/.github/workflows/job-test-windows.yml b/.github/workflows/job-test-windows.yml index c7c81359..936be0c7 100644 --- a/.github/workflows/job-test-windows.yml +++ b/.github/workflows/job-test-windows.yml @@ -13,21 +13,21 @@ jobs: name: test-windows-${{inputs.configuration}} runs-on: windows-2022 steps: - - name: Checkout repository - uses: actions/checkout@v3 + - name: Checkout repository + uses: actions/checkout@v3 - - uses: actions/download-artifact@v4 - with: - name: Windows-x64 - path: Result.Windows.x64.MultiConfig + - uses: actions/download-artifact@v4 + with: + name: Windows-x64 + path: Result.Windows.x64.MultiConfig - - name: Install Vulkan SDK - uses: humbletim/setup-vulkan-sdk@v1.2.0 - with: - vulkan-query-version: 1.3.204.0 - vulkan-components: Vulkan-Headers, Vulkan-Loader - vulkan-use-cache: true + - name: Install Vulkan SDK + uses: humbletim/setup-vulkan-sdk@v1.2.0 + with: + vulkan-query-version: 1.3.204.0 + vulkan-components: Vulkan-Headers, Vulkan-Loader + vulkan-use-cache: true - - name: Run Tests - run: .\Scripts\RunTests.ps1 -Configurations ${{inputs.configuration}} - shell: pwsh + - name: Run Tests + run: .\Scripts\RunTests.ps1 -Configurations ${{inputs.configuration}} + shell: pwsh From b98705fcb0c9e277f2fd742cf8387ecb6eb65401 Mon Sep 17 00:00:00 2001 From: Jean Philippe Date: Tue, 20 Aug 2024 00:23:27 +0100 Subject: [PATCH 22/33] fixed name --- .github/workflows/job-cmakebuild-windows.yml | 2 +- .github/workflows/job-test-windows.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/job-cmakebuild-windows.yml b/.github/workflows/job-cmakebuild-windows.yml index 5d63b235..4a4523a2 100644 --- a/.github/workflows/job-cmakebuild-windows.yml +++ b/.github/workflows/job-cmakebuild-windows.yml @@ -10,7 +10,7 @@ on: default: 'Debug' jobs: - name: cmake-build-windows-${{inputs.configuration}} + name: cmake-build-windows-${{ inputs.configuration }} runs-on: windows-2022 steps: - name: Checkout repository diff --git a/.github/workflows/job-test-windows.yml b/.github/workflows/job-test-windows.yml index 936be0c7..d06123b7 100644 --- a/.github/workflows/job-test-windows.yml +++ b/.github/workflows/job-test-windows.yml @@ -10,7 +10,7 @@ on: default: 'Debug' jobs: - name: test-windows-${{inputs.configuration}} + name: test-windows-${{ inputs.configuration }} runs-on: windows-2022 steps: - name: Checkout repository From ff2c504d8a09289ff716c48fdea20a93e2f64d98 Mon Sep 17 00:00:00 2001 From: Jean Philippe Date: Tue, 20 Aug 2024 00:27:36 +0100 Subject: [PATCH 23/33] fixed jobs --- .github/workflows/job-cmakebuild-windows.yml | 43 ++++++++++---------- .github/workflows/job-test-windows.yml | 43 ++++++++++---------- 2 files changed, 44 insertions(+), 42 deletions(-) diff --git a/.github/workflows/job-cmakebuild-windows.yml b/.github/workflows/job-cmakebuild-windows.yml index 4a4523a2..70d4aab2 100644 --- a/.github/workflows/job-cmakebuild-windows.yml +++ b/.github/workflows/job-cmakebuild-windows.yml @@ -10,26 +10,27 @@ on: default: 'Debug' jobs: - name: cmake-build-windows-${{ inputs.configuration }} - runs-on: windows-2022 - steps: - - name: Checkout repository - uses: actions/checkout@v3 + cmake-build: + name: cmake-build-windows-${{ inputs.configuration }} + runs-on: windows-2022 + steps: + - name: Checkout repository + uses: actions/checkout@v3 - - name: CMake Build - run: .\Scripts\BuildEngine.ps1 -Configurations ${{inputs.configuration}} - shell: pwsh + - name: CMake Build + run: .\Scripts\BuildEngine.ps1 -Configurations ${{inputs.configuration}} + shell: pwsh - - name: Publish Build Artifacts - uses: actions/upload-artifact@v4 - with: - name: Windows-x64 - path: | - Result.Windows.x64.MultiConfig/Panzerfaust/${{inputs.configuration}}/net6.0/ - Result.Windows.x64.MultiConfig/ZEngine/tests/${{inputs.configuration}}/ - !Result.Windows.x64.MultiConfig/Panzerfaust/${{inputs.configuration}}/net6.0/**/Microsoft.CodeAnalysis.CSharp.resources.dll - !Result.Windows.x64.MultiConfig/Panzerfaust/${{inputs.configuration}}/net6.0/**/Microsoft.CodeAnalysis.CSharp.Scripting.resources.dll - !Result.Windows.x64.MultiConfig/Panzerfaust/${{inputs.configuration}}/net6.0/**/Microsoft.CodeAnalysis.resources.dll - !Result.Windows.x64.MultiConfig/Panzerfaust/${{inputs.configuration}}/net6.0/**/Microsoft.CodeAnalysis.Scripting.resources.dll - !Result.Windows.x64.MultiConfig/Panzerfaust/${{inputs.configuration}}/net6.0/runtimes/ - !Result.Windows.x64.MultiConfig/Panzerfaust/${{inputs.configuration}}/net6.0/**/createdump.exe + - name: Publish Build Artifacts + uses: actions/upload-artifact@v4 + with: + name: Windows-x64 + path: | + Result.Windows.x64.MultiConfig/Panzerfaust/${{inputs.configuration}}/net6.0/ + Result.Windows.x64.MultiConfig/ZEngine/tests/${{inputs.configuration}}/ + !Result.Windows.x64.MultiConfig/Panzerfaust/${{inputs.configuration}}/net6.0/**/Microsoft.CodeAnalysis.CSharp.resources.dll + !Result.Windows.x64.MultiConfig/Panzerfaust/${{inputs.configuration}}/net6.0/**/Microsoft.CodeAnalysis.CSharp.Scripting.resources.dll + !Result.Windows.x64.MultiConfig/Panzerfaust/${{inputs.configuration}}/net6.0/**/Microsoft.CodeAnalysis.resources.dll + !Result.Windows.x64.MultiConfig/Panzerfaust/${{inputs.configuration}}/net6.0/**/Microsoft.CodeAnalysis.Scripting.resources.dll + !Result.Windows.x64.MultiConfig/Panzerfaust/${{inputs.configuration}}/net6.0/runtimes/ + !Result.Windows.x64.MultiConfig/Panzerfaust/${{inputs.configuration}}/net6.0/**/createdump.exe diff --git a/.github/workflows/job-test-windows.yml b/.github/workflows/job-test-windows.yml index d06123b7..270bb35c 100644 --- a/.github/workflows/job-test-windows.yml +++ b/.github/workflows/job-test-windows.yml @@ -10,24 +10,25 @@ on: default: 'Debug' jobs: - name: test-windows-${{ inputs.configuration }} - runs-on: windows-2022 - steps: - - name: Checkout repository - uses: actions/checkout@v3 - - - uses: actions/download-artifact@v4 - with: - name: Windows-x64 - path: Result.Windows.x64.MultiConfig - - - name: Install Vulkan SDK - uses: humbletim/setup-vulkan-sdk@v1.2.0 - with: - vulkan-query-version: 1.3.204.0 - vulkan-components: Vulkan-Headers, Vulkan-Loader - vulkan-use-cache: true - - - name: Run Tests - run: .\Scripts\RunTests.ps1 -Configurations ${{inputs.configuration}} - shell: pwsh + test: + name: test-windows-${{ inputs.configuration }} + runs-on: windows-2022 + steps: + - name: Checkout repository + uses: actions/checkout@v3 + + - uses: actions/download-artifact@v4 + with: + name: Windows-x64 + path: Result.Windows.x64.MultiConfig + + - name: Install Vulkan SDK + uses: humbletim/setup-vulkan-sdk@v1.2.0 + with: + vulkan-query-version: 1.3.204.0 + vulkan-components: Vulkan-Headers, Vulkan-Loader + vulkan-use-cache: true + + - name: Run Tests + run: .\Scripts\RunTests.ps1 -Configurations ${{inputs.configuration}} + shell: pwsh From 4f9ebf6e9d248429c647a34d0a586f46997cd610 Mon Sep 17 00:00:00 2001 From: Jean Philippe Date: Tue, 20 Aug 2024 02:47:41 +0100 Subject: [PATCH 24/33] updated published artefacts --- .github/workflows/job-cmakebuild-windows.yml | 5 ++--- .github/workflows/job-test-windows.yml | 8 +++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/job-cmakebuild-windows.yml b/.github/workflows/job-cmakebuild-windows.yml index 70d4aab2..3ecf8534 100644 --- a/.github/workflows/job-cmakebuild-windows.yml +++ b/.github/workflows/job-cmakebuild-windows.yml @@ -24,13 +24,12 @@ jobs: - name: Publish Build Artifacts uses: actions/upload-artifact@v4 with: - name: Windows-x64 + name: Windows-x64-${{inputs.configuration}} path: | - Result.Windows.x64.MultiConfig/Panzerfaust/${{inputs.configuration}}/net6.0/ + Result.Windows.x64.MultiConfig/Panzerfaust/${{inputs.configuration}}/net6.0/win-x64/publish/ Result.Windows.x64.MultiConfig/ZEngine/tests/${{inputs.configuration}}/ !Result.Windows.x64.MultiConfig/Panzerfaust/${{inputs.configuration}}/net6.0/**/Microsoft.CodeAnalysis.CSharp.resources.dll !Result.Windows.x64.MultiConfig/Panzerfaust/${{inputs.configuration}}/net6.0/**/Microsoft.CodeAnalysis.CSharp.Scripting.resources.dll !Result.Windows.x64.MultiConfig/Panzerfaust/${{inputs.configuration}}/net6.0/**/Microsoft.CodeAnalysis.resources.dll !Result.Windows.x64.MultiConfig/Panzerfaust/${{inputs.configuration}}/net6.0/**/Microsoft.CodeAnalysis.Scripting.resources.dll - !Result.Windows.x64.MultiConfig/Panzerfaust/${{inputs.configuration}}/net6.0/runtimes/ !Result.Windows.x64.MultiConfig/Panzerfaust/${{inputs.configuration}}/net6.0/**/createdump.exe diff --git a/.github/workflows/job-test-windows.yml b/.github/workflows/job-test-windows.yml index 270bb35c..5ae063b6 100644 --- a/.github/workflows/job-test-windows.yml +++ b/.github/workflows/job-test-windows.yml @@ -16,11 +16,13 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v3 - - - uses: actions/download-artifact@v4 + + - name: Download All Artifacts + uses: actions/download-artifact@v4 with: - name: Windows-x64 path: Result.Windows.x64.MultiConfig + pattern: Windows-x64-* + merge-multiple: true - name: Install Vulkan SDK uses: humbletim/setup-vulkan-sdk@v1.2.0 From 8c3db4265ba47c886002b13688ad2c3e7272b995 Mon Sep 17 00:00:00 2001 From: Jean Philippe Date: Tue, 20 Aug 2024 11:47:56 +0100 Subject: [PATCH 25/33] connected deploy windows --- .github/workflows/job-cmakebuild-windows.yml | 4 +-- .github/workflows/job-deploy-windows.yml | 27 ++++++++++++-------- .github/workflows/job-test-windows.yml | 4 +-- .github/workflows/windows-build.yml | 4 ++- 4 files changed, 24 insertions(+), 15 deletions(-) diff --git a/.github/workflows/job-cmakebuild-windows.yml b/.github/workflows/job-cmakebuild-windows.yml index 3ecf8534..1750e2d0 100644 --- a/.github/workflows/job-cmakebuild-windows.yml +++ b/.github/workflows/job-cmakebuild-windows.yml @@ -1,6 +1,6 @@ # CMake build of ZEngine for Windows # -name: Build Workflow +name: Windows Build Workflow on: workflow_call: @@ -24,7 +24,7 @@ jobs: - name: Publish Build Artifacts uses: actions/upload-artifact@v4 with: - name: Windows-x64-${{inputs.configuration}} + name: Build-Windows-x64-${{inputs.configuration}} path: | Result.Windows.x64.MultiConfig/Panzerfaust/${{inputs.configuration}}/net6.0/win-x64/publish/ Result.Windows.x64.MultiConfig/ZEngine/tests/${{inputs.configuration}}/ diff --git a/.github/workflows/job-deploy-windows.yml b/.github/workflows/job-deploy-windows.yml index d7218cc3..51734eb1 100644 --- a/.github/workflows/job-deploy-windows.yml +++ b/.github/workflows/job-deploy-windows.yml @@ -1,19 +1,26 @@ # Deploy for Windows # -name: Deploy Workflow +name: Windows Deploy Workflow -on: workflow_call +on: + workflow_call: + inputs: + configuration: + type: string + default: 'Release' jobs: deploy: + name: deploy-windows-x64-${{ inputs.configuration }} runs-on: windows-2022 - steps: - - name: Checkout repository - uses: actions/checkout@v3 + - uses: actions/download-artifact@v4 + with: + path: Result.Windows.x64.MultiConfig + name: Build-Windows-x64-Release - - name: Publish Artifacts - uses: actions/upload-artifact@v2 - with: - name: Windows-x64 - path: Result.Windows.x64.MultiConfig + - name: Publish Artifacts + uses: actions/upload-artifact@v2 + with: + name: Windows-x64-${{ inputs.configuration }} + path: Result.Windows.x64.MultiConfig/Panzerfaust/${{ inputs.configuration }}/net6.0/win-x64/publish/ diff --git a/.github/workflows/job-test-windows.yml b/.github/workflows/job-test-windows.yml index 5ae063b6..4a7a6f72 100644 --- a/.github/workflows/job-test-windows.yml +++ b/.github/workflows/job-test-windows.yml @@ -1,6 +1,6 @@ # Run tests for Windows # -name: Test Workflow +name: Windows Test Workflow on: workflow_call: @@ -21,7 +21,7 @@ jobs: uses: actions/download-artifact@v4 with: path: Result.Windows.x64.MultiConfig - pattern: Windows-x64-* + pattern: Build-Windows-x64-* merge-multiple: true - name: Install Vulkan SDK diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml index 01397c7e..6e8fa1a3 100644 --- a/.github/workflows/windows-build.yml +++ b/.github/workflows/windows-build.yml @@ -22,4 +22,6 @@ jobs: deploy: needs: test - uses: ./.github/workflows/job-deploy-windows.yml \ No newline at end of file + uses: ./.github/workflows/job-deploy-windows.yml + with: + configuration: Release \ No newline at end of file From f231baa95e71b345551509ac6e2dc3ffbe5938bd Mon Sep 17 00:00:00 2001 From: Jean Philippe Date: Tue, 20 Aug 2024 15:12:02 +0100 Subject: [PATCH 26/33] added macos build ci --- .../workflows/job-cmakebuild-macOS-arm64.yml | 34 +++++++++++++++ .../workflows/job-cmakebuild-macOS-x64.yml | 34 +++++++++++++++ .github/workflows/job-deploy-macOS.yml | 29 +++++++++++++ .github/workflows/job-test-macOS-arm64.yml | 27 ++++++++++++ .github/workflows/job-test-macOS-x64.yml | 27 ++++++++++++ .github/workflows/macOS-build.yml | 43 ++++++++++--------- 6 files changed, 173 insertions(+), 21 deletions(-) create mode 100644 .github/workflows/job-cmakebuild-macOS-arm64.yml create mode 100644 .github/workflows/job-cmakebuild-macOS-x64.yml create mode 100644 .github/workflows/job-deploy-macOS.yml create mode 100644 .github/workflows/job-test-macOS-arm64.yml create mode 100644 .github/workflows/job-test-macOS-x64.yml diff --git a/.github/workflows/job-cmakebuild-macOS-arm64.yml b/.github/workflows/job-cmakebuild-macOS-arm64.yml new file mode 100644 index 00000000..70341348 --- /dev/null +++ b/.github/workflows/job-cmakebuild-macOS-arm64.yml @@ -0,0 +1,34 @@ +# CMake build of ZEngine for macOS arm64 +# +name: ZEngine macOS arm64 Workflow + +on: + workflow_call: + inputs: + configuration: + type: string + default: 'Debug' + +jobs: + cmake-build: + name: cmake-build-macOS-arm64-${{ inputs.configuration }} + runs-on: macos-latest + steps: + - name: Checkout repository + uses: actions/checkout@v3 + + - name: CMake Build + run: .\Scripts\BuildEngine.ps1 -Configurations ${{inputs.configuration}} + shell: pwsh + + - name: Publish Build Artifacts + uses: actions/upload-artifact@v4 + with: + name: Build-macOS-arm64-${{inputs.configuration}} + path: | + Result.Darwin.x64.${{inputs.configuration}}/Panzerfaust/${{inputs.configuration}}/net6.0/osx-arm64/publish/ + Result.Darwin.x64.${{inputs.configuration}}/ZEngine/tests/${{inputs.configuration}}/ + !Result.Darwin.x64.${{inputs.configuration}}/Panzerfaust/${{inputs.configuration}}/net6.0/**/Microsoft.CodeAnalysis.CSharp.resources.dll + !Result.Darwin.x64.${{inputs.configuration}}/Panzerfaust/${{inputs.configuration}}/net6.0/**/Microsoft.CodeAnalysis.CSharp.Scripting.resources.dll + !Result.Darwin.x64.${{inputs.configuration}}/Panzerfaust/${{inputs.configuration}}/net6.0/**/Microsoft.CodeAnalysis.resources.dll + !Result.Darwin.x64.${{inputs.configuration}}/Panzerfaust/${{inputs.configuration}}/net6.0/**/Microsoft.CodeAnalysis.Scripting.resources.dll diff --git a/.github/workflows/job-cmakebuild-macOS-x64.yml b/.github/workflows/job-cmakebuild-macOS-x64.yml new file mode 100644 index 00000000..0de2e1d2 --- /dev/null +++ b/.github/workflows/job-cmakebuild-macOS-x64.yml @@ -0,0 +1,34 @@ +# CMake build of ZEngine for macOS x64 +# +name: ZEngine macOS x64 Workflow + +on: + workflow_call: + inputs: + configuration: + type: string + default: 'Debug' + +jobs: + cmake-build: + name: cmake-build-macOS-x64-${{ inputs.configuration }} + runs-on: macos-13 + steps: + - name: Checkout repository + uses: actions/checkout@v3 + + - name: CMake Build + run: .\Scripts\BuildEngine.ps1 -Configurations ${{inputs.configuration}} + shell: pwsh + + - name: Publish Build Artifacts + uses: actions/upload-artifact@v4 + with: + name: Build-macOS-x64-${{inputs.configuration}} + path: | + Result.Darwin.x64.${{inputs.configuration}}/Panzerfaust/${{inputs.configuration}}/net6.0/osx-x64/publish/ + Result.Darwin.x64.${{inputs.configuration}}/ZEngine/tests/${{inputs.configuration}}/ + !Result.Darwin.x64.${{inputs.configuration}}/Panzerfaust/${{inputs.configuration}}/net6.0/**/Microsoft.CodeAnalysis.CSharp.resources.dll + !Result.Darwin.x64.${{inputs.configuration}}/Panzerfaust/${{inputs.configuration}}/net6.0/**/Microsoft.CodeAnalysis.CSharp.Scripting.resources.dll + !Result.Darwin.x64.${{inputs.configuration}}/Panzerfaust/${{inputs.configuration}}/net6.0/**/Microsoft.CodeAnalysis.resources.dll + !Result.Darwin.x64.${{inputs.configuration}}/Panzerfaust/${{inputs.configuration}}/net6.0/**/Microsoft.CodeAnalysis.Scripting.resources.dll diff --git a/.github/workflows/job-deploy-macOS.yml b/.github/workflows/job-deploy-macOS.yml new file mode 100644 index 00000000..7617a08b --- /dev/null +++ b/.github/workflows/job-deploy-macOS.yml @@ -0,0 +1,29 @@ +# Deploy for macOS +# +name: macOS Deploy Workflow + +on: + workflow_call: + inputs: + configuration: + type: string + default: 'Release' + architecture: + type: string + default: 'x64' + +jobs: + deploy: + name: deploy-macOS-${{ inputs.architecture }}-${{ inputs.configuration }} + runs-on: ${{ matrix.architecture == 'x64' && 'macos-13' || 'macos-latest' }} + steps: + - uses: actions/download-artifact@v4 + with: + path: Result.Darwin.x64.${{ inputs.configuration }} + name: Build-macOS-${{ inputs.architecture }}-Release + + - name: Publish Artifacts + uses: actions/upload-artifact@v2 + with: + name: macOS-${{ inputs.architecture }}-${{ inputs.configuration }} + path: Result.Darwin.x64.${{ inputs.configuration }}/Panzerfaust/${{ inputs.configuration }}/net6.0/osx-${{ inputs.architecture }}/publish/ diff --git a/.github/workflows/job-test-macOS-arm64.yml b/.github/workflows/job-test-macOS-arm64.yml new file mode 100644 index 00000000..6370bbd5 --- /dev/null +++ b/.github/workflows/job-test-macOS-arm64.yml @@ -0,0 +1,27 @@ +# Run tests for macOS arm64 +# +name: macOS arm64 Test Workflow + +on: + workflow_call: + inputs: + configuration: + type: string + default: 'Debug' + +jobs: + test: + name: test-macOS-arm64-${{ inputs.configuration }} + runs-on: macos-latest + steps: + - name: Checkout repository + uses: actions/checkout@v3 + + - uses: actions/download-artifact@v4 + with: + name: Build-macOS-arm64-${{ inputs.configuration }} + path: Result.Darwin.x64.${{ inputs.configuration }} + + - name: Run Tests + run: .\Scripts\RunTests.ps1 -Configurations ${{inputs.configuration}} + shell: pwsh diff --git a/.github/workflows/job-test-macOS-x64.yml b/.github/workflows/job-test-macOS-x64.yml new file mode 100644 index 00000000..341c8107 --- /dev/null +++ b/.github/workflows/job-test-macOS-x64.yml @@ -0,0 +1,27 @@ +# Run tests for macOS x64 +# +name: macOS x64 Test Workflow + +on: + workflow_call: + inputs: + configuration: + type: string + default: 'Debug' + +jobs: + test: + name: test-macOS-x64-${{ inputs.configuration }} + runs-on: macos-13 + steps: + - name: Checkout repository + uses: actions/checkout@v3 + + - uses: actions/download-artifact@v4 + with: + name: Build-macOS-x64-${{ inputs.configuration }} + path: Result.Darwin.x64.${{ inputs.configuration }} + + - name: Run Tests + run: .\Scripts\RunTests.ps1 -Configurations ${{inputs.configuration}} + shell: pwsh diff --git a/.github/workflows/macOS-build.yml b/.github/workflows/macOS-build.yml index be41e00b..5f4fc23f 100644 --- a/.github/workflows/macOS-build.yml +++ b/.github/workflows/macOS-build.yml @@ -3,30 +3,31 @@ name: ZEngine macOS Build on: workflow_call jobs: - macOS-Intel-Build: - runs-on: macos-13 + cmake-build: strategy: matrix: - buildConfiguration: [Debug, Release] + buildConfiguration: [Debug, Release] + architecture: [x64, arm64] + uses: ./.github/workflows/job-cmakebuild-macOS-${{ matrix.architecture }}.yml + with: + configuration: ${{matrix.buildConfiguration}} - steps: - - name: Checkout repository - uses: actions/checkout@v2 - - - name: CMake Build - run: .\Scripts\BuildEngine.ps1 -Configurations ${{matrix.buildConfiguration}} - shell: pwsh - - macOS-Silicon-Build: - runs-on: macos-latest + test: + needs: cmake-build strategy: matrix: - buildConfiguration: [Debug, Release] - - steps: - - name: Checkout repository - uses: actions/checkout@v2 + testConfiguration: [Debug, Release] + architecture: [x64, arm64] + uses: ./.github/workflows/job-test-macOS-${{ matrix.architecture }}.yml + with: + configuration: ${{matrix.testConfiguration}} - - name: CMake Build - run: .\Scripts\BuildEngine.ps1 -Configurations ${{matrix.buildConfiguration}} - shell: pwsh + deploy: + needs: test + strategy: + matrix: + architecture: [x64, arm64] + uses: ./.github/workflows/job-deploy-macOS.yml + with: + configuration: Release + architecture: ${{ matrix.architecture }} From 3b3c873bed825437622a86cf28b5961c5b0d6967 Mon Sep 17 00:00:00 2001 From: Jean Philippe Date: Tue, 20 Aug 2024 15:34:04 +0100 Subject: [PATCH 27/33] fixed macOS CI --- .../workflows/job-cmakebuild-macOS-x64.yml | 34 ------------------- ...cOS-arm64.yml => job-cmakebuild-macOS.yml} | 15 ++++---- .github/workflows/job-deploy-macOS.yml | 2 +- .github/workflows/job-test-macOS-x64.yml | 27 --------------- ...est-macOS-arm64.yml => job-test-macOS.yml} | 13 ++++--- .github/workflows/macOS-build.yml | 6 ++-- 6 files changed, 22 insertions(+), 75 deletions(-) delete mode 100644 .github/workflows/job-cmakebuild-macOS-x64.yml rename .github/workflows/{job-cmakebuild-macOS-arm64.yml => job-cmakebuild-macOS.yml} (72%) delete mode 100644 .github/workflows/job-test-macOS-x64.yml rename .github/workflows/{job-test-macOS-arm64.yml => job-test-macOS.yml} (55%) diff --git a/.github/workflows/job-cmakebuild-macOS-x64.yml b/.github/workflows/job-cmakebuild-macOS-x64.yml deleted file mode 100644 index 0de2e1d2..00000000 --- a/.github/workflows/job-cmakebuild-macOS-x64.yml +++ /dev/null @@ -1,34 +0,0 @@ -# CMake build of ZEngine for macOS x64 -# -name: ZEngine macOS x64 Workflow - -on: - workflow_call: - inputs: - configuration: - type: string - default: 'Debug' - -jobs: - cmake-build: - name: cmake-build-macOS-x64-${{ inputs.configuration }} - runs-on: macos-13 - steps: - - name: Checkout repository - uses: actions/checkout@v3 - - - name: CMake Build - run: .\Scripts\BuildEngine.ps1 -Configurations ${{inputs.configuration}} - shell: pwsh - - - name: Publish Build Artifacts - uses: actions/upload-artifact@v4 - with: - name: Build-macOS-x64-${{inputs.configuration}} - path: | - Result.Darwin.x64.${{inputs.configuration}}/Panzerfaust/${{inputs.configuration}}/net6.0/osx-x64/publish/ - Result.Darwin.x64.${{inputs.configuration}}/ZEngine/tests/${{inputs.configuration}}/ - !Result.Darwin.x64.${{inputs.configuration}}/Panzerfaust/${{inputs.configuration}}/net6.0/**/Microsoft.CodeAnalysis.CSharp.resources.dll - !Result.Darwin.x64.${{inputs.configuration}}/Panzerfaust/${{inputs.configuration}}/net6.0/**/Microsoft.CodeAnalysis.CSharp.Scripting.resources.dll - !Result.Darwin.x64.${{inputs.configuration}}/Panzerfaust/${{inputs.configuration}}/net6.0/**/Microsoft.CodeAnalysis.resources.dll - !Result.Darwin.x64.${{inputs.configuration}}/Panzerfaust/${{inputs.configuration}}/net6.0/**/Microsoft.CodeAnalysis.Scripting.resources.dll diff --git a/.github/workflows/job-cmakebuild-macOS-arm64.yml b/.github/workflows/job-cmakebuild-macOS.yml similarity index 72% rename from .github/workflows/job-cmakebuild-macOS-arm64.yml rename to .github/workflows/job-cmakebuild-macOS.yml index 70341348..20474cbf 100644 --- a/.github/workflows/job-cmakebuild-macOS-arm64.yml +++ b/.github/workflows/job-cmakebuild-macOS.yml @@ -1,6 +1,6 @@ -# CMake build of ZEngine for macOS arm64 +# CMake build of ZEngine for macOS # -name: ZEngine macOS arm64 Workflow +name: ZEngine macOS Workflow on: workflow_call: @@ -8,11 +8,14 @@ on: configuration: type: string default: 'Debug' + architecture: + type: string + default: 'x64' jobs: cmake-build: - name: cmake-build-macOS-arm64-${{ inputs.configuration }} - runs-on: macos-latest + name: cmake-build-macOS-${{ inputs.architecture }}-${{ inputs.configuration }} + runs-on: ${{ inputs.architecture == 'x64' && 'macos-13' || 'macos-latest' }} steps: - name: Checkout repository uses: actions/checkout@v3 @@ -24,9 +27,9 @@ jobs: - name: Publish Build Artifacts uses: actions/upload-artifact@v4 with: - name: Build-macOS-arm64-${{inputs.configuration}} + name: Build-macOS-${{ inputs.architecture }}-${{inputs.configuration}} path: | - Result.Darwin.x64.${{inputs.configuration}}/Panzerfaust/${{inputs.configuration}}/net6.0/osx-arm64/publish/ + Result.Darwin.x64.${{inputs.configuration}}/Panzerfaust/${{inputs.configuration}}/net6.0/osx-${{ inputs.architecture }}/publish/ Result.Darwin.x64.${{inputs.configuration}}/ZEngine/tests/${{inputs.configuration}}/ !Result.Darwin.x64.${{inputs.configuration}}/Panzerfaust/${{inputs.configuration}}/net6.0/**/Microsoft.CodeAnalysis.CSharp.resources.dll !Result.Darwin.x64.${{inputs.configuration}}/Panzerfaust/${{inputs.configuration}}/net6.0/**/Microsoft.CodeAnalysis.CSharp.Scripting.resources.dll diff --git a/.github/workflows/job-deploy-macOS.yml b/.github/workflows/job-deploy-macOS.yml index 7617a08b..5628483d 100644 --- a/.github/workflows/job-deploy-macOS.yml +++ b/.github/workflows/job-deploy-macOS.yml @@ -15,7 +15,7 @@ on: jobs: deploy: name: deploy-macOS-${{ inputs.architecture }}-${{ inputs.configuration }} - runs-on: ${{ matrix.architecture == 'x64' && 'macos-13' || 'macos-latest' }} + runs-on: ${{ inputs.architecture == 'x64' && 'macos-13' || 'macos-latest' }} steps: - uses: actions/download-artifact@v4 with: diff --git a/.github/workflows/job-test-macOS-x64.yml b/.github/workflows/job-test-macOS-x64.yml deleted file mode 100644 index 341c8107..00000000 --- a/.github/workflows/job-test-macOS-x64.yml +++ /dev/null @@ -1,27 +0,0 @@ -# Run tests for macOS x64 -# -name: macOS x64 Test Workflow - -on: - workflow_call: - inputs: - configuration: - type: string - default: 'Debug' - -jobs: - test: - name: test-macOS-x64-${{ inputs.configuration }} - runs-on: macos-13 - steps: - - name: Checkout repository - uses: actions/checkout@v3 - - - uses: actions/download-artifact@v4 - with: - name: Build-macOS-x64-${{ inputs.configuration }} - path: Result.Darwin.x64.${{ inputs.configuration }} - - - name: Run Tests - run: .\Scripts\RunTests.ps1 -Configurations ${{inputs.configuration}} - shell: pwsh diff --git a/.github/workflows/job-test-macOS-arm64.yml b/.github/workflows/job-test-macOS.yml similarity index 55% rename from .github/workflows/job-test-macOS-arm64.yml rename to .github/workflows/job-test-macOS.yml index 6370bbd5..0a3ff182 100644 --- a/.github/workflows/job-test-macOS-arm64.yml +++ b/.github/workflows/job-test-macOS.yml @@ -1,6 +1,6 @@ -# Run tests for macOS arm64 +# Run tests for macOS # -name: macOS arm64 Test Workflow +name: macOS Test Workflow on: workflow_call: @@ -8,18 +8,21 @@ on: configuration: type: string default: 'Debug' + architecture: + type: string + default: 'x64' jobs: test: - name: test-macOS-arm64-${{ inputs.configuration }} - runs-on: macos-latest + name: test-macOS-${{ inputs.architecture }}-${{ inputs.configuration }} + runs-on: ${{ inputs.architecture == 'x64' && 'macos-13' || 'macos-latest' }} steps: - name: Checkout repository uses: actions/checkout@v3 - uses: actions/download-artifact@v4 with: - name: Build-macOS-arm64-${{ inputs.configuration }} + name: Build-macOS-${{ inputs.architecture }}-${{ inputs.configuration }} path: Result.Darwin.x64.${{ inputs.configuration }} - name: Run Tests diff --git a/.github/workflows/macOS-build.yml b/.github/workflows/macOS-build.yml index 5f4fc23f..43e02aef 100644 --- a/.github/workflows/macOS-build.yml +++ b/.github/workflows/macOS-build.yml @@ -8,9 +8,10 @@ jobs: matrix: buildConfiguration: [Debug, Release] architecture: [x64, arm64] - uses: ./.github/workflows/job-cmakebuild-macOS-${{ matrix.architecture }}.yml + uses: ./.github/workflows/job-cmakebuild-macOS.yml with: configuration: ${{matrix.buildConfiguration}} + architecture: ${{ matrix.architecture }} test: needs: cmake-build @@ -18,9 +19,10 @@ jobs: matrix: testConfiguration: [Debug, Release] architecture: [x64, arm64] - uses: ./.github/workflows/job-test-macOS-${{ matrix.architecture }}.yml + uses: ./.github/workflows/job-test-macOS.yml with: configuration: ${{matrix.testConfiguration}} + architecture: ${{ matrix.architecture }} deploy: needs: test From 26569712caedac87f3e4f6ddf05df1ef3c4caf0d Mon Sep 17 00:00:00 2001 From: Jean Philippe Date: Tue, 20 Aug 2024 16:22:37 +0100 Subject: [PATCH 28/33] updated run tests --- Scripts/RunTests.ps1 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Scripts/RunTests.ps1 b/Scripts/RunTests.ps1 index b0b7f19e..18528e54 100644 --- a/Scripts/RunTests.ps1 +++ b/Scripts/RunTests.ps1 @@ -64,8 +64,10 @@ function RunTests { "Windows" { $testExecutablePath = [IO.Path]::Combine($OutputBuildDirectory, "ZEngine", "tests", $Configuration, "ZEngineTests.exe") } + "Darwin" { + $testExecutablePath = Join-Path $OutputBuildDirectory -ChildPath "ZEngine/tests/$Configuration/ZEngineTests" + } "Linux" {} - "Darwin" {} Default { throw 'This system is not supported' } From a3110b798c6b6fa3a026ed0c862aa79df45faa8f Mon Sep 17 00:00:00 2001 From: Jean Philippe Date: Tue, 20 Aug 2024 17:01:13 +0100 Subject: [PATCH 29/33] fixed memory test case --- ZEngine/tests/MemoryOperation_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ZEngine/tests/MemoryOperation_test.cpp b/ZEngine/tests/MemoryOperation_test.cpp index 0b489531..9c42f0aa 100644 --- a/ZEngine/tests/MemoryOperation_test.cpp +++ b/ZEngine/tests/MemoryOperation_test.cpp @@ -49,7 +49,7 @@ TEST(MemoryOperationsTest, SecureMemmove) TEST(MemoryOperationsTest, SecureStrncpy) { char src[] = "Hello"; - char dest[10]; + char dest[10] = { 0 }; EXPECT_EQ(secure_strncpy(dest, sizeof(dest), src, 5), MEMORY_OP_SUCCESS); EXPECT_STREQ(dest, "Hello"); From bfcdf27e9d933753612a9bfe87ed7109bad5f426 Mon Sep 17 00:00:00 2001 From: Jean Philippe Date: Tue, 20 Aug 2024 18:21:21 +0100 Subject: [PATCH 30/33] make test executable --- .github/workflows/job-test-macOS.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/job-test-macOS.yml b/.github/workflows/job-test-macOS.yml index 0a3ff182..d3adad63 100644 --- a/.github/workflows/job-test-macOS.yml +++ b/.github/workflows/job-test-macOS.yml @@ -26,5 +26,7 @@ jobs: path: Result.Darwin.x64.${{ inputs.configuration }} - name: Run Tests - run: .\Scripts\RunTests.ps1 -Configurations ${{inputs.configuration}} shell: pwsh + run: | + chmod +x .\Result.Darwin.x64.${{ inputs.configuration }}\ZEngine\tests\${{ inputs.configuration }}\ZEngineTests + .\Scripts\RunTests.ps1 -Configurations ${{inputs.configuration}} From 0ef3de3a546fa60150af06aa6aa0ae7206c7031c Mon Sep 17 00:00:00 2001 From: Jean Philippe Date: Tue, 20 Aug 2024 18:41:15 +0100 Subject: [PATCH 31/33] updated action version --- .github/workflows/job-cmakebuild-macOS.yml | 2 +- .github/workflows/job-cmakebuild-windows.yml | 2 +- .github/workflows/job-deploy-macOS.yml | 2 +- .github/workflows/job-deploy-windows.yml | 2 +- .github/workflows/job-test-macOS.yml | 12 +++++++----- .github/workflows/job-test-windows.yml | 2 +- 6 files changed, 12 insertions(+), 10 deletions(-) diff --git a/.github/workflows/job-cmakebuild-macOS.yml b/.github/workflows/job-cmakebuild-macOS.yml index 20474cbf..7d7f32bb 100644 --- a/.github/workflows/job-cmakebuild-macOS.yml +++ b/.github/workflows/job-cmakebuild-macOS.yml @@ -18,7 +18,7 @@ jobs: runs-on: ${{ inputs.architecture == 'x64' && 'macos-13' || 'macos-latest' }} steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: CMake Build run: .\Scripts\BuildEngine.ps1 -Configurations ${{inputs.configuration}} diff --git a/.github/workflows/job-cmakebuild-windows.yml b/.github/workflows/job-cmakebuild-windows.yml index 1750e2d0..da0dbd4e 100644 --- a/.github/workflows/job-cmakebuild-windows.yml +++ b/.github/workflows/job-cmakebuild-windows.yml @@ -15,7 +15,7 @@ jobs: runs-on: windows-2022 steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: CMake Build run: .\Scripts\BuildEngine.ps1 -Configurations ${{inputs.configuration}} diff --git a/.github/workflows/job-deploy-macOS.yml b/.github/workflows/job-deploy-macOS.yml index 5628483d..280826ef 100644 --- a/.github/workflows/job-deploy-macOS.yml +++ b/.github/workflows/job-deploy-macOS.yml @@ -23,7 +23,7 @@ jobs: name: Build-macOS-${{ inputs.architecture }}-Release - name: Publish Artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: macOS-${{ inputs.architecture }}-${{ inputs.configuration }} path: Result.Darwin.x64.${{ inputs.configuration }}/Panzerfaust/${{ inputs.configuration }}/net6.0/osx-${{ inputs.architecture }}/publish/ diff --git a/.github/workflows/job-deploy-windows.yml b/.github/workflows/job-deploy-windows.yml index 51734eb1..99aa311f 100644 --- a/.github/workflows/job-deploy-windows.yml +++ b/.github/workflows/job-deploy-windows.yml @@ -20,7 +20,7 @@ jobs: name: Build-Windows-x64-Release - name: Publish Artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: Windows-x64-${{ inputs.configuration }} path: Result.Windows.x64.MultiConfig/Panzerfaust/${{ inputs.configuration }}/net6.0/win-x64/publish/ diff --git a/.github/workflows/job-test-macOS.yml b/.github/workflows/job-test-macOS.yml index d3adad63..f19e4909 100644 --- a/.github/workflows/job-test-macOS.yml +++ b/.github/workflows/job-test-macOS.yml @@ -18,15 +18,17 @@ jobs: runs-on: ${{ inputs.architecture == 'x64' && 'macos-13' || 'macos-latest' }} steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - - uses: actions/download-artifact@v4 + - name: Download Artifacts + uses: actions/download-artifact@v4 with: name: Build-macOS-${{ inputs.architecture }}-${{ inputs.configuration }} path: Result.Darwin.x64.${{ inputs.configuration }} + - name: Update access permission of tests + run: chmod +x ./Result.Darwin.x64.${{ inputs.configuration }}/ZEngine/tests/${{ inputs.configuration }}/ZEngineTests + - name: Run Tests + run: .\Scripts\RunTests.ps1 -Configurations ${{inputs.configuration}} shell: pwsh - run: | - chmod +x .\Result.Darwin.x64.${{ inputs.configuration }}\ZEngine\tests\${{ inputs.configuration }}\ZEngineTests - .\Scripts\RunTests.ps1 -Configurations ${{inputs.configuration}} diff --git a/.github/workflows/job-test-windows.yml b/.github/workflows/job-test-windows.yml index 4a7a6f72..19f30ce3 100644 --- a/.github/workflows/job-test-windows.yml +++ b/.github/workflows/job-test-windows.yml @@ -15,7 +15,7 @@ jobs: runs-on: windows-2022 steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Download All Artifacts uses: actions/download-artifact@v4 From 9b510d9f08cc439c03dbe47faa98bfadce1d0b8e Mon Sep 17 00:00:00 2001 From: Jean Philippe Date: Tue, 20 Aug 2024 22:04:43 +0100 Subject: [PATCH 32/33] fixed pipeline macOS CI --- .github/workflows/job-cmakebuild-macOS.yml | 1 + .github/workflows/job-test-macOS.yml | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/job-cmakebuild-macOS.yml b/.github/workflows/job-cmakebuild-macOS.yml index 7d7f32bb..a1237c4d 100644 --- a/.github/workflows/job-cmakebuild-macOS.yml +++ b/.github/workflows/job-cmakebuild-macOS.yml @@ -30,6 +30,7 @@ jobs: name: Build-macOS-${{ inputs.architecture }}-${{inputs.configuration}} path: | Result.Darwin.x64.${{inputs.configuration}}/Panzerfaust/${{inputs.configuration}}/net6.0/osx-${{ inputs.architecture }}/publish/ + Result.Darwin.x64.${{inputs.configuration}}/__externals/Vulkan-Loader/loader/${{ inputs.configuration }}/ Result.Darwin.x64.${{inputs.configuration}}/ZEngine/tests/${{inputs.configuration}}/ !Result.Darwin.x64.${{inputs.configuration}}/Panzerfaust/${{inputs.configuration}}/net6.0/**/Microsoft.CodeAnalysis.CSharp.resources.dll !Result.Darwin.x64.${{inputs.configuration}}/Panzerfaust/${{inputs.configuration}}/net6.0/**/Microsoft.CodeAnalysis.CSharp.Scripting.resources.dll diff --git a/.github/workflows/job-test-macOS.yml b/.github/workflows/job-test-macOS.yml index f19e4909..f801bb0e 100644 --- a/.github/workflows/job-test-macOS.yml +++ b/.github/workflows/job-test-macOS.yml @@ -19,6 +19,8 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v4 + with: + path: macOS-${{ inputs.architecture }}-${{ inputs.configuration }} - name: Download Artifacts uses: actions/download-artifact@v4 @@ -26,9 +28,9 @@ jobs: name: Build-macOS-${{ inputs.architecture }}-${{ inputs.configuration }} path: Result.Darwin.x64.${{ inputs.configuration }} - - name: Update access permission of tests + - name: Update access permission of ZEngineTests run: chmod +x ./Result.Darwin.x64.${{ inputs.configuration }}/ZEngine/tests/${{ inputs.configuration }}/ZEngineTests - name: Run Tests - run: .\Scripts\RunTests.ps1 -Configurations ${{inputs.configuration}} + run: .\Scripts\RunTests.ps1 -Configurations ${{ inputs.configuration }} shell: pwsh From abc4c8dacd235debb92cd1f48b17961ee1ea68be Mon Sep 17 00:00:00 2001 From: Jean Philippe Date: Tue, 20 Aug 2024 22:27:54 +0100 Subject: [PATCH 33/33] fixed failure --- .github/workflows/job-test-macOS.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/job-test-macOS.yml b/.github/workflows/job-test-macOS.yml index f801bb0e..62c22a6d 100644 --- a/.github/workflows/job-test-macOS.yml +++ b/.github/workflows/job-test-macOS.yml @@ -19,8 +19,6 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v4 - with: - path: macOS-${{ inputs.architecture }}-${{ inputs.configuration }} - name: Download Artifacts uses: actions/download-artifact@v4