Compare commits
2 Commits
release-94
...
release-b8
| Author | SHA1 | Date | |
|---|---|---|---|
| b85c2b75b6 | |||
| f614199ce5 |
@@ -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: |
|
||||
|
||||
@@ -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.
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user