windows (#405)
This commit is contained in:
parent
6e5df533ed
commit
bbb9987140
24
.github/workflows/windows.yml
vendored
24
.github/workflows/windows.yml
vendored
@ -4,7 +4,7 @@ on:
|
||||
push:
|
||||
branches: [ "main", "release-**"]
|
||||
pull_request:
|
||||
branches: [ "main" ]
|
||||
branches: [ "main", "headless-mode" ]
|
||||
|
||||
jobs:
|
||||
build-windows:
|
||||
@ -40,14 +40,14 @@ jobs:
|
||||
run: |
|
||||
build/vctest/Release/vctest.exe -e build/Release/VoxelEngine.exe -d dev/tests -u build
|
||||
timeout-minutes: 1
|
||||
# - name: Package for Windows
|
||||
# run: |
|
||||
# mkdir packaged
|
||||
# cp -r build/* packaged/
|
||||
# cp C:/Windows/System32/msvcp140.dll packaged/Release/msvcp140.dll
|
||||
# mv packaged/Release/VoxelEngine.exe packaged/Release/VoxelCore.exe
|
||||
# working-directory: ${{ github.workspace }}
|
||||
# - uses: actions/upload-artifact@v4
|
||||
# with:
|
||||
# name: Windows-Build
|
||||
# path: 'packaged/Release/*'
|
||||
- name: Package for Windows
|
||||
run: |
|
||||
mkdir packaged
|
||||
cp -r build/* packaged/
|
||||
cp C:/Windows/System32/msvcp140.dll packaged/Release/msvcp140.dll
|
||||
mv packaged/Release/VoxelEngine.exe packaged/Release/VoxelCore.exe
|
||||
working-directory: ${{ github.workspace }}
|
||||
- uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: Windows-Build
|
||||
path: 'build/Release/*'
|
||||
|
||||
@ -143,11 +143,11 @@ static bool run_test(const Config& config, const fs::path& path) {
|
||||
|
||||
auto name = path.stem();
|
||||
std::stringstream ss;
|
||||
ss << fix_path(config.executable.string()) << " --headless";
|
||||
ss << " --test " << path;
|
||||
ss << " --res " << config.resDir;
|
||||
ss << " --dir " << config.workingDir;
|
||||
//ss << " >" << fix_path(outputFile.string()) << " 2>&1";
|
||||
ss << fs::canonical(config.executable) << " --headless";
|
||||
ss << " --test " << fix_path(path.string());
|
||||
ss << " --res " << fix_path(config.resDir.string());
|
||||
ss << " --dir " << fix_path(config.workingDir.string());
|
||||
ss << " >" << fix_path(outputFile.string()) << " 2>&1";
|
||||
auto command = ss.str();
|
||||
|
||||
print_separator(std::cout);
|
||||
@ -189,8 +189,6 @@ int main(int argc, char** argv) {
|
||||
}
|
||||
dump_config(config);
|
||||
|
||||
system("tree build/Release");
|
||||
|
||||
std::vector<fs::path> tests;
|
||||
std::cout << "scanning for tests" << std::endl;
|
||||
for (const auto& entry : fs::directory_iterator(config.directory)) {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user