Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: binaries for CLI and Server #1499

Merged
merged 54 commits into from
Oct 17, 2024
Merged
Changes from 1 commit
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
5454488
fix: update swagger
vansangpfiev Oct 14, 2024
5caa3be
Merge branch 'dev' of github.com:janhq/nitro into fix/swagger
vansangpfiev Oct 14, 2024
3e3dff6
fix: start stop model with API call
vansangpfiev Oct 14, 2024
1bd0bbf
fix: model del
vansangpfiev Oct 14, 2024
536e8ad
fix: model get
vansangpfiev Oct 15, 2024
e4a6f7c
fix: model alias
vansangpfiev Oct 15, 2024
30e62fd
fix: model import
vansangpfiev Oct 15, 2024
0f2e0a4
fix: model status
vansangpfiev Oct 15, 2024
d37f0bf
fix: model list
vansangpfiev Oct 15, 2024
2a00d34
fix: models update
vansangpfiev Oct 15, 2024
55b5ae2
fix: engine list
vansangpfiev Oct 15, 2024
963d83f
fix: engine get
vansangpfiev Oct 15, 2024
ca7b235
fix: engine uninstall
vansangpfiev Oct 15, 2024
6bd9af2
Merge branch 'dev' of github.com:janhq/nitro into fix/swagger
vansangpfiev Oct 15, 2024
bb2a431
Merge branch 'dev' into fix/swagger
vansangpfiev Oct 16, 2024
0fa1edf
fix: add cmake for cli
vansangpfiev Oct 16, 2024
69d0878
Merge branch 'dev' of github.com:janhq/nitro into fix/swagger
vansangpfiev Oct 16, 2024
f404b9a
Merge branch 'fix/swagger' of github.com:janhq/nitro into fix/swagger
vansangpfiev Oct 16, 2024
ab84659
Merge branch 'fix/swagger' into fix/2-b
vansangpfiev Oct 16, 2024
8eef533
fix: binary name
vansangpfiev Oct 16, 2024
109bf0b
fix: test CMakeLists
sangjanai Oct 16, 2024
db649e5
fix: Makefile
sangjanai Oct 16, 2024
3a39b16
Merge branch 'dev' into fix/2-b
vansangpfiev Oct 16, 2024
8d437f8
fix: installer for 2 binaries
hiento09 Oct 16, 2024
ec1131a
Merge branch 'fix/2-b' of github.com:janhq/cortex.cpp into fix/2-b
hiento09 Oct 16, 2024
1e64d35
fix: installer for 2 binaries
hiento09 Oct 16, 2024
5a616f7
fix: windows installer disable dir page
hiento09 Oct 16, 2024
3114515
fix: add upd server cmd (in-progress)
vansangpfiev Oct 16, 2024
120ca7b
fix: add installer file to latest folder s3 for nightly updater
hiento09 Oct 16, 2024
fa5e761
fix: installer adds param skip post install
hiento09 Oct 16, 2024
be04f4b
fix: skip postinstall macos
jan-service-account Oct 16, 2024
2411315
fix: nightly installer
vansangpfiev Oct 17, 2024
ed1f0ab
fix: remove update server cmd
vansangpfiev Oct 17, 2024
4853daa
fix: pre-package
vansangpfiev Oct 17, 2024
363ec5c
Merge branch 'fix/2-b' of github.com:janhq/nitro into fix/2-b
vansangpfiev Oct 17, 2024
6de6aab
Merge branch 'dev' of github.com:janhq/nitro into fix/2-b
vansangpfiev Oct 17, 2024
d2cf334
fix: build
vansangpfiev Oct 17, 2024
ab02590
fix: support cortex update --server
sangjanai Oct 17, 2024
f548665
fix: installer adds param skip post install
hiento09 Oct 17, 2024
5b75268
fix: installer adds param skip post install
hiento09 Oct 17, 2024
00cb109
fix: correct command
sangjanai Oct 17, 2024
efb989d
Merge branch 'fix/2-b' of https://github.com/janhq/cortex.cpp into fi…
sangjanai Oct 17, 2024
5b79baa
fix: update beta and stable
sangjanai Oct 17, 2024
9704f65
fix: build
vansangpfiev Oct 17, 2024
40d8adf
Merge branch 'dev' of https://github.com/janhq/cortex.cpp into fix/2-b
sangjanai Oct 17, 2024
b2e6d84
chore: move commands to cli
sangjanai Oct 17, 2024
5159440
Merge branch 'dev' of https://github.com/janhq/cortex.cpp into fix/2-b
sangjanai Oct 17, 2024
6645e61
fix: models start timeout
sangjanai Oct 17, 2024
1e8a9ee
chore: refactor main cli
vansangpfiev Oct 17, 2024
8885cec
fix: log
vansangpfiev Oct 17, 2024
78d7627
fix: log
vansangpfiev Oct 17, 2024
c9ca89a
Merge branch 'dev' of github.com:janhq/nitro into fix/2-b
vansangpfiev Oct 17, 2024
d18926c
fix: support --port for server
vansangpfiev Oct 17, 2024
523bd4b
fix: build
vansangpfiev Oct 17, 2024
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
Prev Previous commit
Next Next commit
fix: correct command
sangjanai committed Oct 17, 2024

Verified

This commit was signed with the committer’s verified signature.
reneme René Meusel
commit 00cb1090214215e7c33fcc71bea738ad1a0dc8a7
6 changes: 3 additions & 3 deletions engine/commands/cortex_upd_cmd.cc
Original file line number Diff line number Diff line change
@@ -55,15 +55,15 @@ std::string GetNightlyInstallerName(const std::string& v,
// C:\Users\vansa\AppData\Local\Temp\cortex\cortex-windows-amd64-network-installer.exe
std::string GetInstallCmd(const std::string& exe_path) {
#if defined(__APPLE__) && defined(__MACH__)
return "SKIP_POSTINSTALL=true && sudo installer -pkg " + exe_path +
" -target /";
return "touch /var/tmp/cortex_installer_skip_postinstall && sudo installer -pkg " + exe_path +
" -target / && rm /var/tmp/cortex_installer_skip_postinstall";
#elif defined(__linux__)
return "echo -e \"n\\n\" | sudo SKIP_POSTINSTALL=true apt install -y "
"--allow-downgrades " +
exe_path;
#else
return "start /wait \"\" " + exe_path +
" /SkipPostInstall /VERYSILENT /SUPPRESSMSGBOXES /NORESTART";
" /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SkipPostInstall";
#endif
}