Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/src/App.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

class App extends Application
{
const NAME = "Doil Version 20250918 - build 2025-09-18";
const NAME = "Doil Version 20250924 - build 2025-09-24";

public function __construct(Command ...$commands)
{
Expand Down
5 changes: 3 additions & 2 deletions app/src/Commands/Pack/ExportCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -252,8 +252,9 @@ protected function exportProjectConfig(OutputInterface $output, string $path, st
}

if (count($remotes) > 1) {
$remotes = array_filter($remotes, function ($url) use ($branch, $path) {
return $this->git->isBranchInRepo($path . "/volumes/ilias", $url, $branch);
$remotes = array_filter($remotes, function ($url) use ($branch, $instance) {
$cmd = "git ls-remote --heads {$url} refs/heads/{$branch}";
return $this->docker->executeDockerCommandWithReturn($instance, $cmd);
});

if (count($remotes) == 0) {
Expand Down
1 change: 0 additions & 1 deletion app/src/Lib/Git/Git.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,4 @@ public function cloneBare(string $url, string $path) : void;
public function setLocalConfig(string $path, ...$commands) : void;
public function checkoutRemote(string $path, string $branch) : void;
public function getRemotes(string $path) : array;
public function isBranchInRepo(string $path, string $url, string $branch) : bool;
}
19 changes: 0 additions & 19 deletions app/src/Lib/Git/GitShell.php
Original file line number Diff line number Diff line change
Expand Up @@ -126,23 +126,4 @@ public function getRemotes(string $path) : array

return $arr;
}

public function isBranchInRepo(string $path, string $url, string $branch) : bool
{
$cmd = [
"git",
"ls-remote",
"--heads",
$url,
"refs/heads/$branch"
];

$this->logger->info("Get remote repos for $path");
$result = $this->run($cmd, $this->logger);

if ($result == "") {
return false;
}
return true;
}
}
7 changes: 7 additions & 0 deletions setup/updates/update-20250924.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#!/usr/bin/env bash

doil_update_20250924() {
cp -r ${SCRIPT_DIR}/../app/src/* /usr/local/lib/doil/app/src/

return $?
}