1 Commits

Author SHA1 Message Date
f8c475c632 Release build squashed
Some checks failed
/ release (Debug, map[deps:macos-universal flag:arm64 name:macos scons-script:./.github/workflows/scripts/mac/scons-build.sh suffix:-silicon version:14]) (push) Has been cancelled
/ release (Debug, map[deps:macos-universal flag:x86_64 name:macos scons-script:./.github/workflows/scripts/mac/scons-build.sh suffix:-intel version:13]) (push) Has been cancelled
/ release (Debug, map[name:windows scons-script:./.github/workflows/scripts/win/scons-build.bat suffix: version:2019]) (push) Has been cancelled
/ release (Release, map[deps:macos-universal flag:arm64 name:macos scons-script:./.github/workflows/scripts/mac/scons-build.sh suffix:-silicon version:14]) (push) Has been cancelled
/ release (Release, map[deps:macos-universal flag:x86_64 name:macos scons-script:./.github/workflows/scripts/mac/scons-build.sh suffix:-intel version:13]) (push) Has been cancelled
/ release (Release, map[name:windows scons-script:./.github/workflows/scripts/win/scons-build.bat suffix: version:2019]) (push) Has been cancelled
2025-05-20 16:14:56 -05:00
2 changed files with 11 additions and 16 deletions

View File

@@ -25,4 +25,4 @@ unzip butler.zip
chmod +x ${butler_exe}
# just a sanity check run (and also helpful in case you're sharing CI logs)
./${butler_exe} -V
./${butler_exe} push "build/Blades of Exile/" nqn/blades-of-exile:${release_dir}
./${butler_exe} push "build/Blades of Exile/" nqn/blades-of-exile:${butler_channel}

View File

@@ -93,18 +93,16 @@ std::vector<fs::path> all_scen_dirs() {
// and Itch meta files
// (designers might want to ship a README.txt)
fs::path itch_apps_path = scenDir/".."/".."/"itch"/"apps";
if(fs::is_directory(itch_apps_path)){
for(fs::directory_iterator app_iter(itch_apps_path); app_iter != fs::directory_iterator(); app_iter++){
fs::path app = *app_iter;
for(fs::directory_iterator file_iter(app); file_iter != fs::directory_iterator(); file_iter++){
fs::path file = *file_iter;
if(file.extension() == ".boes"){
scen_dirs.push_back(*app_iter);
break;
}else if(file.extension() == ".itch"){
}else if(file.extension() != ".txt"){
break;
}
for(fs::directory_iterator app_iter(itch_apps_path); app_iter != fs::directory_iterator(); app_iter++){
fs::path app = *app_iter;
for(fs::directory_iterator file_iter(app); file_iter != fs::directory_iterator(); file_iter++){
fs::path file = *file_iter;
if(file.extension() == ".boes"){
scen_dirs.push_back(*app_iter);
break;
}else if(file.extension() == ".itch"){
}else if(file.extension() != ".txt"){
break;
}
}
}
@@ -122,9 +120,6 @@ fs::path locate_scenario(std::string scen_name, bool allow_unpacked) {
fs::path scenPath;
for(fs::path scenDir : all_scen_dirs()){
// Some possible directories, like the Itch client installation folder, might not exist
if(!fs::is_directory(scenDir)) continue;
for(fs::recursive_directory_iterator iter(scenDir); iter != fs::recursive_directory_iterator(); iter++) {
fs::file_status stat = iter->status();
std::string fname = iter->path().filename().string().c_str();