2 Commits

Author SHA1 Message Date
b85c2b75b6 fix(build): resolve Linux compile errors
All checks were successful
Build Releases / Build Linux x64 DEB (push) Successful in 4m4s
Build Releases / Build Windows x64 (push) Successful in 7m4s
Build Releases / Create Release (push) Successful in 1m39s
2026-06-19 18:41:43 -05:00
f614199ce5 fix(build): disable Wayland on Linux CI
Some checks failed
Build Releases / Build Linux x64 DEB (push) Failing after 2m35s
Build Releases / Create Release (push) Has been cancelled
Build Releases / Build Windows x64 (push) Has been cancelled
2026-06-19 18:35:11 -05:00
4 changed files with 11 additions and 4 deletions

View File

@@ -144,7 +144,10 @@ jobs:
- name: Install dependencies
run: |
sudo apt-get update
sudo apt-get install -y cmake ninja-build curl jq dpkg-dev
sudo apt-get install -y \
cmake ninja-build curl jq dpkg-dev \
libx11-dev libxrandr-dev libxinerama-dev libxcursor-dev libxi-dev libxext-dev \
libgl1-mesa-dev
- name: Configure Linux release build
run: |

View File

@@ -17,6 +17,10 @@ set(GLFW_BUILD_DOCS OFF CACHE BOOL "" FORCE)
set(GLFW_BUILD_TESTS OFF CACHE BOOL "" FORCE)
set(GLFW_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
set(GLFW_INSTALL OFF CACHE BOOL "" FORCE)
if(UNIX AND NOT APPLE)
set(GLFW_BUILD_X11 ON CACHE BOOL "" FORCE)
set(GLFW_BUILD_WAYLAND OFF CACHE BOOL "" FORCE)
endif()
add_subdirectory(vendor/glfw EXCLUDE_FROM_ALL)
# Dear ImGui does not ship a CMake target, so keep its static-library recipe here.

View File

@@ -123,7 +123,6 @@ namespace
return origin != remotes.end() ? *origin : remotes.front();
}
#ifdef _WIN32
std::string encodeBase64(std::string_view value)
{
static constexpr std::string_view alphabet =
@@ -143,7 +142,6 @@ namespace
}
return encoded;
}
#endif
std::vector<std::string> withAuthOverrideArguments(std::vector<std::string> arguments,
const std::optional<GitAuthOverride> &auth)
@@ -933,6 +931,8 @@ bool GitManager::captureGit(RepositoryView &repository, const std::vector<std::s
}
#else
(void)arguments;
(void)command_output;
(void)stdin_data;
error = "Git commands are currently supported on Windows";
return false;
#endif

View File

@@ -1336,7 +1336,7 @@ void sidebar_item_context(const std::string& item, SidebarItemKind kind) {
if (ImGui::MenuItem(ICON_TB_FOLDER_OPEN " Open in file manager")) {
std::string error;
const std::filesystem::path path = kind == SidebarItemKind::worktree
? g_git_manager->worktreePath(repo(), item, error)
? std::filesystem::path(g_git_manager->worktreePath(repo(), item, error))
: std::filesystem::path(repo().path) / item;
if (path.empty() || !izo::OpenPath(path, &error)) g_notice = error;
}