Skip to content

Commit 18466ac

Browse files
committed
Simplified Tests Due to install workflow
1 parent fc092c4 commit 18466ac

File tree

7 files changed

+12
-25
lines changed

7 files changed

+12
-25
lines changed

.github/workflows/job-test-linux.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,9 @@ jobs:
2727
uses: actions/download-artifact@v4
2828
with:
2929
name: Build-linux-${{ inputs.configuration }}
30-
path: Result.Linux.${{inputs.architecture}}.${{ inputs.configuration }}
3130

3231
- name: Update access permission of ZEngineTests
33-
run: chmod +x ./Result.Linux.x64.${{ inputs.configuration }}/tests/ZEngineTests
32+
run: chmod +x ./tests/ZEngineTests
3433

3534
- name: Run Tests
3635
run: .\Scripts\RunTests.ps1 -Configurations ${{ inputs.configuration }}

.github/workflows/job-test-macOS.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,10 @@ jobs:
2727
uses: actions/download-artifact@v4
2828
with:
2929
name: Build-macOS-${{ inputs.architecture }}-${{ inputs.configuration }}
30-
path: Result.Darwin.${{inputs.architecture}}.${{ inputs.configuration }}
3130

3231
- name: Update access permission of ZEngineTests
33-
run: chmod +x ./Result.Darwin.${{inputs.architecture}}.${{ inputs.configuration }}/tests/ZEngineTests
32+
run: chmod +x ./tests/ZEngineTests
3433

3534
- name: Run Tests
36-
run: .\Scripts\RunTests.ps1 -Configurations ${{ inputs.configuration }} -Architecture ${{ inputs.architecture }}
35+
run: .\Scripts\RunTests.ps1 -Configurations ${{ inputs.configuration }}
3736
shell: pwsh

.github/workflows/job-test-windows.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ jobs:
2121
uses: actions/download-artifact@v4
2222
with:
2323
path: Result.Windows.x64.MultiConfig
24-
name: Build-Windows-x64-${{ inputs.configuration }}
2524

2625
- name: Run Tests
2726
shell: pwsh

Scripts/RunTests.ps1

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -63,21 +63,7 @@ function RunTests {
6363
[string]$Configuration
6464
)
6565

66-
[string]$testExecutablePath = ""
67-
switch ($SystemName) {
68-
"Windows" {
69-
$testExecutablePath = "tests", "ZEngineTests.exe")
70-
}
71-
"Darwin" {
72-
$testExecutablePath = "tests/ZEngineTests"
73-
}
74-
"Linux" {
75-
$testExecutablePath = "tests/ZEngineTests"
76-
}
77-
Default {
78-
throw 'This system is not supported'
79-
}
80-
}
66+
[string]$testExecutablePath = "tests/ZEngineTests"
8167

8268
# Check if the executable exists
8369
if (Test-Path $testExecutablePath) {

ZEngine/ZEngine/Core/CoroutineScheduler.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ namespace ZEngine::Core
1515
ReadyCallback Ready = nullptr;
1616
ExecuteCallback Action = nullptr;
1717

18-
operator bool() noexcept
18+
operator bool() noexcept
1919
{
2020
return (Ready && Action);
2121
}

ZEngine/ZEngine/Hardwares/VulkanDevice.h

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,9 @@ namespace ZEngine::Hardwares
7777
VkBuffer Handle = VK_NULL_HANDLE;
7878
VmaAllocation Allocation = nullptr;
7979

80-
operator bool() const
80+
//clang-format off
81+
operator bool() const
82+
//clang-format on
8183
{
8284
return (Handle != VK_NULL_HANDLE);
8385
}
@@ -91,7 +93,9 @@ namespace ZEngine::Hardwares
9193
VkSampler Sampler{VK_NULL_HANDLE};
9294
VmaAllocation Allocation{nullptr};
9395

94-
operator bool() const
96+
//clang-format off
97+
operator bool() const
98+
//clang-format on
9599
{
96100
return (Handle != VK_NULL_HANDLE);
97101
}

repoConfiguration.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
},
2525
"LLVM": {
2626
"Version": "20.1.7",
27-
"MaximumVersion": "20.2.0"
27+
"MaximumVersion": "21.2.0"
2828
}
2929
}
3030
}

0 commit comments

Comments
 (0)