PulseStudio/VoxelEngine
PulseStudio/VoxelEngine
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

windows (#405)

Browse Source
This commit is contained in:
MihailRis 2024-12-07 21:42:39 +03:00 committed by GitHub
parent 6e5df533ed
commit bbb9987140
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
.github/workflows/windows.yml vendored
View File

@ -4,7 +4,7 @@ on:
push: push:
branches: [ "main", "release-**"] branches: [ "main", "release-**"]
pull_request: pull_request:
branches: [ "main" ] branches: [ "main", "headless-mode" ]
jobs: jobs:
build-windows: build-windows:
@ -40,14 +40,14 @@ jobs:
run: | run: |
build/vctest/Release/vctest.exe -e build/Release/VoxelEngine.exe -d dev/tests -u build build/vctest/Release/vctest.exe -e build/Release/VoxelEngine.exe -d dev/tests -u build
timeout-minutes: 1 timeout-minutes: 1
# - name: Package for Windows - name: Package for Windows
# run: | run: |
# mkdir packaged mkdir packaged
# cp -r build/* packaged/ cp -r build/* packaged/
# cp C:/Windows/System32/msvcp140.dll packaged/Release/msvcp140.dll cp C:/Windows/System32/msvcp140.dll packaged/Release/msvcp140.dll
# mv packaged/Release/VoxelEngine.exe packaged/Release/VoxelCore.exe mv packaged/Release/VoxelEngine.exe packaged/Release/VoxelCore.exe
# working-directory: ${{ github.workspace }} working-directory: ${{ github.workspace }}
# - uses: actions/upload-artifact@v4 - uses: actions/upload-artifact@v4
# with: with:
# name: Windows-Build name: Windows-Build
# path: 'packaged/Release/*' path: 'build/Release/*'

12
vctest/main.cpp
View File

@ -143,11 +143,11 @@ static bool run_test(const Config& config, const fs::path& path) {
auto name = path.stem(); auto name = path.stem();
std::stringstream ss; std::stringstream ss;
ss << fix_path(config.executable.string()) << " --headless"; ss << fs::canonical(config.executable) << " --headless";
ss << " --test " << path; ss << " --test " << fix_path(path.string());
ss << " --res " << config.resDir; ss << " --res " << fix_path(config.resDir.string());
ss << " --dir " << config.workingDir; ss << " --dir " << fix_path(config.workingDir.string());
//ss << " >" << fix_path(outputFile.string()) << " 2>&1"; ss << " >" << fix_path(outputFile.string()) << " 2>&1";
auto command = ss.str(); auto command = ss.str();
print_separator(std::cout); print_separator(std::cout);
@ -189,8 +189,6 @@ int main(int argc, char** argv) {
} }
dump_config(config); dump_config(config);
system("tree build/Release");
std::vector<fs::path> tests; std::vector<fs::path> tests;
std::cout << "scanning for tests" << std::endl; std::cout << "scanning for tests" << std::endl;
for (const auto& entry : fs::directory_iterator(config.directory)) { for (const auto& entry : fs::directory_iterator(config.directory)) {