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

release: Jan 0.5.14 release cut #4468

Merged
merged 170 commits into from
Jan 16, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
170 commits
Select commit Hold shift + click to select a range
da4336c
Merge pull request #4338 from janhq/main
louis-menlo Dec 26, 2024
0e72372
Update Jan Docs
imtuyethan Dec 26, 2024
50ea481
[WIP] Update Jan Docs
imtuyethan Dec 26, 2024
77fdd56
Update Overview page
imtuyethan Dec 27, 2024
ea63879
[WIP] Update Quickstart section
imtuyethan Dec 27, 2024
43593b4
[WIP] Updating Installation Page
imtuyethan Dec 27, 2024
d982f81
docs: create n8n integration
0xHieu01 Dec 28, 2024
bd0e525
chore: upgrade to turbo v2 and reduce ci quality gate runtime (#4324)
hiento09 Dec 29, 2024
d0c21ee
[WIP] Updating docs...
imtuyethan Dec 29, 2024
42353d9
[WIP] updating docs...
imtuyethan Dec 29, 2024
a6a0cb3
feat: local engine management (#4334)
urmauur Dec 30, 2024
60bb719
Update Overview, Quickstart & Installation pages
imtuyethan Dec 30, 2024
b8bd846
chore: refactor extensions build script for optimization
louis-menlo Dec 30, 2024
da55b46
Merge pull request #4360 from janhq/main
louis-menlo Dec 30, 2024
724c9a8
[WIP] Updating basic usage pages
imtuyethan Dec 31, 2024
6d88b82
Merge pull request #4363 from janhq/chore/reduce-extensions-build-time
louis-menlo Dec 31, 2024
fc7a771
enhancement: update ui delete engine with modal confirmation (#4359)
urmauur Dec 31, 2024
c1f918a
chore: improve development dev-ex with auto extensions migration
louis-menlo Dec 31, 2024
947522e
chore: simplify the build steps by reducing redundant yarn installs
louis-menlo Dec 31, 2024
0be5349
Merge pull request #4370 from janhq/chore/enhance-dev-ex
louis-menlo Dec 31, 2024
e9ed152
chore: deprecate make build-joi
louis-menlo Dec 31, 2024
84ed5ec
chore: add config-yarn
louis-menlo Dec 31, 2024
2fe4514
Merge pull request #4371 from janhq/chore/correct-ci-run-script
louis-menlo Dec 31, 2024
8ae1e4a
chore: refactor core and server packages
louis-menlo Dec 31, 2024
1bb9d6c
chore: remove server functions from core package
louis-menlo Dec 31, 2024
a9529f2
Merge pull request #4373 from janhq/chore/refactor-core-and-server-pa…
louis-menlo Dec 31, 2024
2f755ee
fix: if the default engine isn't installed, the app should reset it
louis-menlo Jan 1, 2025
e321e48
chore: reduce test build steps
louis-menlo Jan 1, 2025
e9958df
chore: use windows-latest for testing
louis-menlo Jan 1, 2025
b0e50da
chore: disable portal reporter
louis-menlo Jan 1, 2025
bfbf351
Updated Model Management page
imtuyethan Jan 1, 2025
150bc7e
Updated Model Parameters page
imtuyethan Jan 1, 2025
b2ab542
Merge branch 'dev' of https://github.com/janhq/jan into dev
imtuyethan Jan 1, 2025
ed3bdf4
Merge pull request #4379 from janhq/fix/should-reset-default-engine-o…
louis-menlo Jan 1, 2025
04bd41b
Merge pull request #4383 from janhq/chore/reduce-test-build-steps
louis-menlo Jan 2, 2025
9fb6b9f
new: changelog posts and images for v0.5.12 (#4388)
eckartal Jan 2, 2025
45a5191
Updated Troubleshooting page
imtuyethan Jan 2, 2025
57f3644
Updated Quickstart page
imtuyethan Jan 2, 2025
d494260
Update Installation pages & Jan Data Folder page
imtuyethan Jan 2, 2025
12dfa0d
Update jan data folder page
imtuyethan Jan 3, 2025
4f53502
Merge branch 'dev' of https://github.com/janhq/jan into dev
imtuyethan Jan 3, 2025
f213666
small updates on model management page
imtuyethan Jan 3, 2025
72118e7
Updated Threads page
imtuyethan Jan 3, 2025
d17c2ea
fix: input scrolls to the bottom when set the caret to the top (#4399)
louis-menlo Jan 3, 2025
f6f432f
chore: add flathub submission (#4391)
Minh141120 Jan 4, 2025
57b4efc
Merge branch 'dev' of https://github.com/janhq/jan into dev
imtuyethan Jan 5, 2025
00ad453
updated troubleshooting commands
imtuyethan Jan 5, 2025
0d6b927
Updated some images
imtuyethan Jan 5, 2025
13d6d0f
Updated some images
imtuyethan Jan 5, 2025
f4dec37
Updated Assistants page
imtuyethan Jan 5, 2025
dc2e89f
[WIP] Updating Settings page
imtuyethan Jan 5, 2025
1680a21
Removed Keyboard Shortcuts page
imtuyethan Jan 5, 2025
3f2d2ef
enhancement: instruction textare using autoresize (#4404)
urmauur Jan 6, 2025
287ced5
Updated Settings page
imtuyethan Jan 6, 2025
b7d2207
Updated Settings page
imtuyethan Jan 6, 2025
6627505
updated llama.cpp page
imtuyethan Jan 6, 2025
b4d2176
Merge pull request #4408 from janhq/main
louis-menlo Jan 6, 2025
b12e13e
Updated Tools page
imtuyethan Jan 7, 2025
c619f8c
Merge branch 'dev' of https://github.com/janhq/jan into dev
imtuyethan Jan 7, 2025
3b0d4aa
Merge branch 'dev' into chore/update-jan-web
imtuyethan Jan 7, 2025
1f8f5cb
resolve missing images issues
imtuyethan Jan 7, 2025
0252667
Merge branch 'dev' into chore/update-jan-docs
imtuyethan Jan 7, 2025
a2021a4
updated images
imtuyethan Jan 7, 2025
6ee369b
updated Overview page
imtuyethan Jan 7, 2025
bd4d818
Updated Quickstart page
imtuyethan Jan 7, 2025
31120d2
updated installation pages
imtuyethan Jan 7, 2025
e8ebc82
updated model management page
imtuyethan Jan 7, 2025
ca6bcf4
updated retrieval page
imtuyethan Jan 7, 2025
2c4acb3
Merge pull request #4362 from janhq/chore/update-jan-docs
imtuyethan Jan 7, 2025
56a5ad8
Merge pull request #4410 from janhq/chore/update-jan-web
imtuyethan Jan 7, 2025
867a51c
Merge branch 'dev' of https://github.com/janhq/jan into dev
imtuyethan Jan 7, 2025
e082ae2
Merge branch 'chore/update-jan-docs' of https://github.com/janhq/jan …
imtuyethan Jan 7, 2025
57b605f
Merge pull request #4412 from janhq/chore/update-jan-docs
imtuyethan Jan 7, 2025
a90287b
[WIP] Updating Extensions & Engines guide
imtuyethan Jan 7, 2025
77ebd68
Merge branch 'dev' into chore/update-extensions-and-engines-docs
imtuyethan Jan 7, 2025
f8ad764
Merge branch 'dev' of https://github.com/janhq/jan into dev
imtuyethan Jan 7, 2025
c3076f9
Updated Extensions pages
imtuyethan Jan 7, 2025
d4d6f2c
Merge branch 'chore/update-extensions-and-engines-docs' of https://gi…
imtuyethan Jan 7, 2025
d63c248
enhancement: Update Cortex page with better description & UX
louis-menlo Jan 7, 2025
a197dc2
Updated Engines pages
imtuyethan Jan 7, 2025
6afec69
chore: fix settings component type
louis-menlo Jan 7, 2025
09dacef
chore: correct CSS of extension settings
louis-menlo Jan 7, 2025
55dbc9f
fix: scrollable settings view
louis-menlo Jan 7, 2025
6cd392a
Merge pull request #4416 from janhq/chore/enhance-cortex-settings-page
louis-menlo Jan 8, 2025
500529b
Updated Engines pages
imtuyethan Jan 8, 2025
59c6c3f
Merge branch 'dev' into chore/update-extensions-and-engines-docs
imtuyethan Jan 8, 2025
48aa053
fix: add per_page params on github releases endpoint (#4425)
urmauur Jan 9, 2025
7af18cf
Add support version patch and restore support for all platforms
bxdoan Jan 10, 2025
d2717fb
fix: load model fail on windows
louis-menlo Jan 12, 2025
55804ca
Add support version patch and restore support for all platforms
bxdoan Jan 13, 2025
1d349ff
Add support version patch and restore support for all platforms
bxdoan Jan 13, 2025
a3077ea
chore: bump engine version to 0.1.43
louis-menlo Jan 13, 2025
7fe92c1
Merge pull request #4437 from janhq/fix/load-model-fail-on-windows-la…
louis-menlo Jan 13, 2025
d480b87
Add support version patch and restore support for all platforms
bxdoan Jan 13, 2025
dfdf417
Merge pull request #4438 from janhq/chore/bump-engine-version-to-0.1.43
louis-menlo Jan 13, 2025
5812fd7
Update electron/package.json
louis-menlo Jan 13, 2025
53cd8a4
Update electron/package.json
louis-menlo Jan 13, 2025
50769af
Merge branch 'dev' of https://github.com/janhq/jan into dev
imtuyethan Jan 13, 2025
b6c1fb5
Merge pull request #4429 from bxdoan/DESIRED_BRANCH
louis-menlo Jan 13, 2025
bc44c8e
updated images (app versions, remove tensorRT-LLM, remove Cortex sett…
imtuyethan Jan 13, 2025
4dcd2c7
Merge branch 'dev' of https://github.com/janhq/jan into dev
imtuyethan Jan 13, 2025
f46eb87
Merge branch 'chore/update-extensions-and-engines-docs' of https://gi…
imtuyethan Jan 13, 2025
18f99b1
Merge branch 'dev' into chore/update-extensions-and-engines-docs
imtuyethan Jan 13, 2025
395f5d4
fix: sass legacy warn (#4440)
urmauur Jan 13, 2025
ed131f9
Removed unnecessary pages & files
imtuyethan Jan 13, 2025
5457d34
Merge branch 'chore/update-extensions-and-engines-docs' of https://gi…
imtuyethan Jan 13, 2025
1427f29
Merge branch 'dev' into chore/update-extensions-and-engines-docs
imtuyethan Jan 13, 2025
93bac5f
Merge branch 'dev' of https://github.com/janhq/jan into dev
imtuyethan Jan 13, 2025
3b019ca
Resolved conflicts
imtuyethan Jan 13, 2025
1ee0095
updated remote engines pages
imtuyethan Jan 13, 2025
548dd6c
chore: resolve button state download engine variant (#4444)
urmauur Jan 13, 2025
0048fe0
Small updates on Settings page
imtuyethan Jan 14, 2025
54aae45
Changed MMAP to mmap
imtuyethan Jan 14, 2025
1cf9e0e
Merge branch 'dev' into chore/update-extensions-and-engines-docs
imtuyethan Jan 14, 2025
f4dad4c
Merge branch 'dev' of https://github.com/janhq/jan into dev
imtuyethan Jan 14, 2025
6b98f45
fix: ci npm publish (#4447)
hiento09 Jan 14, 2025
f4b3880
Merge branch 'dev' of https://github.com/janhq/jan into dev
imtuyethan Jan 14, 2025
2a0601f
feat: remote engine management (#4364)
urmauur Jan 14, 2025
389d83e
Updated Install Engines page with correct commands
imtuyethan Jan 14, 2025
d15f6fe
Merge branch 'dev' into chore/update-extensions-and-engines-docs
imtuyethan Jan 14, 2025
b644467
Merge branch 'dev' of https://github.com/janhq/jan into dev
imtuyethan Jan 14, 2025
8bb44b5
Merge pull request #4413 from janhq/chore/update-extensions-and-engin…
imtuyethan Jan 14, 2025
ebf6f38
Merge branch 'dev' into docs/add-n8n-integration
imtuyethan Jan 14, 2025
154e9cc
Merge pull request #4345 from 0xHieu01/docs/add-n8n-integration
louis-menlo Jan 14, 2025
97cd022
Updated parameters descriptions
imtuyethan Jan 14, 2025
e5b6901
Merge branch 'dev' into chore/update-in-app-copy
imtuyethan Jan 14, 2025
1174772
Updated some copies in Settings
imtuyethan Jan 14, 2025
276f5d1
Updated some Settings copies
imtuyethan Jan 14, 2025
99536b7
Resolved conflicts
imtuyethan Jan 14, 2025
6b44bde
Resolved conflicts
imtuyethan Jan 14, 2025
a7a497a
test: fix failed test cases
louis-menlo Jan 15, 2025
ffec1cf
feat: delete all threads (#4446)
bxdoan Jan 15, 2025
4e387a7
Merge pull request #4448 from janhq/chore/update-in-app-copy
imtuyethan Jan 15, 2025
58bb1b4
fix: incorrect default max_tokens set - legacy issue (#4451)
louis-menlo Jan 15, 2025
06ee10b
chore: deprecate tensorrt-llm extension (#4453)
louis-menlo Jan 15, 2025
231c711
chore: add chat completion field form add remote engine (#4452)
urmauur Jan 15, 2025
1964a9c
fix: hide placeholder python engine and unsupported openai o1 system …
louis-menlo Jan 15, 2025
9579e86
fix: empty response on some generation attempts (#4454)
louis-menlo Jan 15, 2025
f5dd44c
feat: move cortex extension settings to local engine page
louis-menlo Jan 15, 2025
0f4b35d
fix: engines in settings sometime not populated properly
louis-menlo Jan 15, 2025
00930eb
fix: mismatch NGL number between UI and model settings
louis-menlo Jan 15, 2025
dd791b9
Merge pull request #4457 from janhq/feat/move-cortex-extension-settin…
louis-menlo Jan 15, 2025
bde35b4
Merge pull request #4458 from janhq/fix/mismatch-between-ui-and-model…
louis-menlo Jan 15, 2025
63c938e
fix: windows uninstall not force close app (#4459)
hiento09 Jan 15, 2025
b1a99c8
Updated api server docs
imtuyethan Jan 15, 2025
d800f3f
Merge branch 'dev' into chore/update-api-server-docs
imtuyethan Jan 15, 2025
2b1a49d
Added image & updated some parts
imtuyethan Jan 15, 2025
afad0f0
Added image & updated some parts
imtuyethan Jan 15, 2025
2d1d0c3
Added image & updated some parts
imtuyethan Jan 15, 2025
c869b5c
Merge branch 'chore/update-api-server-docs' of https://github.com/jan…
imtuyethan Jan 15, 2025
52cb278
Improved Install Extensions Page
imtuyethan Jan 15, 2025
54becc8
Small amendments
imtuyethan Jan 16, 2025
91e0ca1
chore: fix engine description hyperlink display
louis-menlo Jan 16, 2025
4748bbb
Merge pull request #4463 from janhq/chore/fix-engine-description-hype…
louis-menlo Jan 16, 2025
3852ed6
Merge pull request #4461 from janhq/chore/improve-install-extensions-…
imtuyethan Jan 16, 2025
99388f4
chore: log engine variant symlink error
louis-menlo Jan 16, 2025
ae7a6c5
chore: update symbolic type
louis-menlo Jan 16, 2025
f5e2712
chore: symlink dll should be type file instead of junction
louis-menlo Jan 16, 2025
d1bfb41
Small amendments
imtuyethan Jan 16, 2025
3763e96
Merge branch 'dev' into chore/update-api-server-docs
imtuyethan Jan 16, 2025
d05f200
Merge pull request #4460 from janhq/chore/update-api-server-docs
imtuyethan Jan 16, 2025
a4649fa
chore: bump engine version to 0.1.46
louis-menlo Jan 16, 2025
687b034
fix: file symlink does not work on windows for cuda dependencies
louis-menlo Jan 16, 2025
713926e
chore: attempt to stop model before switching engine variant
louis-menlo Jan 16, 2025
589fc53
fix: race condition between model stop and engine update
louis-menlo Jan 16, 2025
5298d75
chore: typo for universal download
louis-menlo Jan 16, 2025
89e21be
fix: linter
louis-menlo Jan 16, 2025
eeac4c0
Merge pull request #4465 from janhq/chore/log-engine-variant-symlink
louis-menlo Jan 16, 2025
99c8ef1
chore: bump cortex server rc3
louis-menlo Jan 16, 2025
9213649
Merge pull request #4467 from janhq/chore/bump-cortex-server-rc3
louis-menlo Jan 16, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .github/scripts/rename-uninstaller.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ if [ ! -f "$FILE_PATH" ]; then
fi

# Perform the replacements
sed -i -e "s#Jan#Jan-$CHANNEL#g" "$FILE_PATH"
sed -i -e "s#jan#jan-$CHANNEL#g" "$FILE_PATH"

# Notify completion
Expand Down
98 changes: 36 additions & 62 deletions .github/workflows/jan-electron-linter-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,16 +44,17 @@ jobs:
- uses: actions/checkout@v3
with:
ref: ${{ github.base_ref }}
- name: Use Node.js v20.9.0
- name: Use Node.js 20.x
uses: actions/setup-node@v3
with:
node-version: v20.9.0
node-version: 20

- name: Install dependencies
run: |
make config-yarn
yarn
yarn build:core
yarn build:joi
yarn build:core

- name: Run test coverage
run: yarn test:coverage
Expand All @@ -66,7 +67,7 @@ jobs:

test-on-macos:
if: (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository) || github.event_name == 'push' || github.event_name == 'workflow_dispatch'
runs-on: [self-hosted, macOS, macos-desktop]
runs-on: macos-latest
steps:
- name: Getting the repo
uses: actions/checkout@v3
Expand All @@ -78,6 +79,10 @@ jobs:
with:
node-version: 20

- name: Set IS_TEST environment variable
run: |
echo "IS_TEST=true" >> $GITHUB_ENV

- name: 'Cleanup cache'
continue-on-error: true
run: |
Expand All @@ -94,24 +99,19 @@ jobs:
run: |
echo "REPORT_PORTAL_DESCRIPTION=${{github.sha}})" >> $GITHUB_ENV

- name: 'Config report portal'
run: |
make update-playwright-config REPORT_PORTAL_URL=${{ secrets.REPORT_PORTAL_URL }} REPORT_PORTAL_API_KEY=${{ secrets.REPORT_PORTAL_API_KEY }} REPORT_PORTAL_PROJECT_NAME=${{ secrets.REPORT_PORTAL_PROJECT_NAME }} REPORT_PORTAL_LAUNCH_NAME="Jan App macos" REPORT_PORTAL_DESCRIPTION="${{env.REPORT_PORTAL_DESCRIPTION}}"
# - name: 'Config report portal'
# run: |
# make update-playwright-config REPORT_PORTAL_URL=${{ secrets.REPORT_PORTAL_URL }} REPORT_PORTAL_API_KEY=${{ secrets.REPORT_PORTAL_API_KEY }} REPORT_PORTAL_PROJECT_NAME=${{ secrets.REPORT_PORTAL_PROJECT_NAME }} REPORT_PORTAL_LAUNCH_NAME="Jan App macos" REPORT_PORTAL_DESCRIPTION="${{env.REPORT_PORTAL_DESCRIPTION}}"

- name: Linter and test
run: |
npm config set registry ${{ secrets.NPM_PROXY }} --global
yarn config set registry ${{ secrets.NPM_PROXY }} --global
make test
env:
CSC_IDENTITY_AUTO_DISCOVERY: 'false'
# TURBO_API: '${{ secrets.TURBO_API }}'
# TURBO_TEAM: 'macos'
# TURBO_TOKEN: '${{ secrets.TURBO_TOKEN }}'

test-on-macos-pr-target:
if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository
runs-on: [self-hosted, macOS, macos-desktop]
runs-on: macos-latest
steps:
- name: Getting the repo
uses: actions/checkout@v3
Expand All @@ -131,8 +131,6 @@ jobs:

- name: Linter and test
run: |
npm config set registry https://registry.npmjs.org --global
yarn config set registry https://registry.npmjs.org --global
make test
env:
CSC_IDENTITY_AUTO_DISCOVERY: 'false'
Expand Down Expand Up @@ -174,32 +172,27 @@ jobs:
run: |
echo "REPORT_PORTAL_DESCRIPTION=${{github.sha}}" >> $GITHUB_ENV

- name: 'Config report portal'
shell: bash
run: |
make update-playwright-config REPORT_PORTAL_URL=${{ secrets.REPORT_PORTAL_URL }} REPORT_PORTAL_API_KEY=${{ secrets.REPORT_PORTAL_API_KEY }} REPORT_PORTAL_PROJECT_NAME=${{ secrets.REPORT_PORTAL_PROJECT_NAME }} REPORT_PORTAL_LAUNCH_NAME="Jan App Windows ${{ matrix.antivirus-tools }}" REPORT_PORTAL_DESCRIPTION="${{env.REPORT_PORTAL_DESCRIPTION}}"
# - name: 'Config report portal'
# shell: bash
# run: |
# make update-playwright-config REPORT_PORTAL_URL=${{ secrets.REPORT_PORTAL_URL }} REPORT_PORTAL_API_KEY=${{ secrets.REPORT_PORTAL_API_KEY }} REPORT_PORTAL_PROJECT_NAME=${{ secrets.REPORT_PORTAL_PROJECT_NAME }} REPORT_PORTAL_LAUNCH_NAME="Jan App Windows ${{ matrix.antivirus-tools }}" REPORT_PORTAL_DESCRIPTION="${{env.REPORT_PORTAL_DESCRIPTION}}"

- name: Linter and test
shell: powershell
run: |
npm config set registry ${{ secrets.NPM_PROXY }} --global
yarn config set registry ${{ secrets.NPM_PROXY }} --global
make test
# env:
# TURBO_API: '${{ secrets.TURBO_API }}'
# TURBO_TEAM: 'windows'
# TURBO_TOKEN: '${{ secrets.TURBO_TOKEN }}'

test-on-windows-pr:
if: (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository)
runs-on: windows-desktop-default-windows-security
if: (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository) || github.event_name == 'workflow_dispatch'
runs-on: windows-latest
steps:
- name: Getting the repo
uses: actions/checkout@v3
with:
fetch-depth: 0

- name: Installing node
uses: actions/setup-node@v1
uses: actions/setup-node@v3
with:
node-version: 20

Expand All @@ -222,25 +215,19 @@ jobs:
run: |
echo "REPORT_PORTAL_DESCRIPTION=${{github.event.after}}" >> $GITHUB_ENV

- name: 'Config report portal'
shell: bash
run: |
make update-playwright-config REPORT_PORTAL_URL=${{ secrets.REPORT_PORTAL_URL }} REPORT_PORTAL_API_KEY=${{ secrets.REPORT_PORTAL_API_KEY }} REPORT_PORTAL_PROJECT_NAME=${{ secrets.REPORT_PORTAL_PROJECT_NAME }} REPORT_PORTAL_LAUNCH_NAME="Jan App Windows" REPORT_PORTAL_DESCRIPTION="${{env.REPORT_PORTAL_DESCRIPTION}}"
# - name: 'Config report portal'
# shell: bash
# run: |
# make update-playwright-config REPORT_PORTAL_URL=${{ secrets.REPORT_PORTAL_URL }} REPORT_PORTAL_API_KEY=${{ secrets.REPORT_PORTAL_API_KEY }} REPORT_PORTAL_PROJECT_NAME=${{ secrets.REPORT_PORTAL_PROJECT_NAME }} REPORT_PORTAL_LAUNCH_NAME="Jan App Windows" REPORT_PORTAL_DESCRIPTION="${{env.REPORT_PORTAL_DESCRIPTION}}"

- name: Linter and test
shell: powershell
run: |
npm config set registry ${{ secrets.NPM_PROXY }} --global
yarn config set registry ${{ secrets.NPM_PROXY }} --global
make test
# env:
# TURBO_API: '${{ secrets.TURBO_API }}'
# TURBO_TEAM: 'windows'
# TURBO_TOKEN: '${{ secrets.TURBO_TOKEN }}'

test-on-windows-pr-target:
if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository
runs-on: windows-desktop-default-windows-security
runs-on: windows-latest
steps:
- name: Getting the repo
uses: actions/checkout@v3
Expand Down Expand Up @@ -268,12 +255,10 @@ jobs:
- name: Linter and test
shell: powershell
run: |
npm config set registry https://registry.npmjs.org --global
yarn config set registry https://registry.npmjs.org --global
make test

test-on-ubuntu:
runs-on: [self-hosted, Linux, ubuntu-desktop]
runs-on: ubuntu-latest
if: (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository) || github.event_name == 'push' || github.event_name == 'workflow_dispatch'
steps:
- name: Getting the repo
Expand Down Expand Up @@ -302,22 +287,16 @@ jobs:
run: |
echo "REPORT_PORTAL_DESCRIPTION=${{github.sha}}" >> $GITHUB_ENV

- name: 'Config report portal'
shell: bash
run: |
make update-playwright-config REPORT_PORTAL_URL=${{ secrets.REPORT_PORTAL_URL }} REPORT_PORTAL_API_KEY=${{ secrets.REPORT_PORTAL_API_KEY }} REPORT_PORTAL_PROJECT_NAME=${{ secrets.REPORT_PORTAL_PROJECT_NAME }} REPORT_PORTAL_LAUNCH_NAME="Jan App Linux" REPORT_PORTAL_DESCRIPTION="${{env.REPORT_PORTAL_DESCRIPTION}}"
# - name: 'Config report portal'
# shell: bash
# run: |
# make update-playwright-config REPORT_PORTAL_URL=${{ secrets.REPORT_PORTAL_URL }} REPORT_PORTAL_API_KEY=${{ secrets.REPORT_PORTAL_API_KEY }} REPORT_PORTAL_PROJECT_NAME=${{ secrets.REPORT_PORTAL_PROJECT_NAME }} REPORT_PORTAL_LAUNCH_NAME="Jan App Linux" REPORT_PORTAL_DESCRIPTION="${{env.REPORT_PORTAL_DESCRIPTION}}"

- name: Linter and test
run: |
export DISPLAY=$(w -h | awk 'NR==1 {print $2}')
echo -e "Display ID: $DISPLAY"
npm config set registry ${{ secrets.NPM_PROXY }} --global
yarn config set registry ${{ secrets.NPM_PROXY }} --global
make test
# env:
# TURBO_API: '${{ secrets.TURBO_API }}'
# TURBO_TEAM: 'linux'
# TURBO_TOKEN: '${{ secrets.TURBO_TOKEN }}'

- uses: actions/upload-artifact@v4
if: always()
Expand All @@ -327,7 +306,7 @@ jobs:
retention-days: 2

coverage-check:
runs-on: [self-hosted, Linux, ubuntu-desktop]
runs-on: ubuntu-latest
needs: base_branch_cov
if: (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository) || github.event_name == 'push' || github.event_name == 'workflow_dispatch'
steps:
Expand All @@ -341,6 +320,9 @@ jobs:
with:
node-version: 20

- name: Install yarn
run: npm install -g yarn

- name: 'Cleanup cache'
continue-on-error: true
run: |
Expand All @@ -356,15 +338,9 @@ jobs:
run: |
export DISPLAY=$(w -h | awk 'NR==1 {print $2}')
echo -e "Display ID: $DISPLAY"
npm config set registry ${{ secrets.NPM_PROXY }} --global
yarn config set registry ${{ secrets.NPM_PROXY }} --global
make lint
yarn build:test
yarn test:coverage
# env:
# TURBO_API: '${{ secrets.TURBO_API }}'
# TURBO_TEAM: 'linux'
# TURBO_TOKEN: '${{ secrets.TURBO_TOKEN }}'

- name: Generate Code Coverage report
id: code-coverage
Expand All @@ -377,7 +353,7 @@ jobs:
show-annotations: 'warning'

test-on-ubuntu-pr-target:
runs-on: [self-hosted, Linux, ubuntu-desktop]
runs-on: ubuntu-latest
if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository
steps:
- name: Getting the repo
Expand All @@ -400,6 +376,4 @@ jobs:
run: |
export DISPLAY=$(w -h | awk 'NR==1 {print $2}')
echo -e "Display ID: $DISPLAY"
npm config set registry https://registry.npmjs.org --global
yarn config set registry https://registry.npmjs.org --global
make test
8 changes: 4 additions & 4 deletions .github/workflows/publish-npm-core.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
name: Publish plugin models Package to npmjs
name: Publish core Package to npmjs
on:
push:
tags: ["v[0-9]+.[0-9]+.[0-9]+-core"]
paths: ["core/**"]
paths: ["core/**", ".github/workflows/publish-npm-core.yml"]
pull_request:
paths: ["core/**"]
paths: ["core/**", ".github/workflows/publish-npm-core.yml"]
jobs:
build-and-publish-plugins:
environment: production
Expand Down Expand Up @@ -45,7 +45,7 @@ jobs:
node-version: "20.x"
registry-url: "https://registry.npmjs.org"

- run: cd core && yarn install && yarn build
- run: cd core && corepack enable && corepack prepare [email protected] --activate && yarn --version && yarn config set -H enableImmutableInstalls false && yarn install && yarn build

- run: cd core && yarn publish --access public
if: github.event_name == 'push'
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/publish-npm-joi.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
name: Publish plugin models Package to npmjs
name: Publish joi Package to npmjs
on:
push:
tags: ["v[0-9]+.[0-9]+.[0-9]+-joi"]
paths: ["joi/**"]
paths: ["joi/**", ".github/workflows/publish-npm-joi.yml"]
pull_request:
paths: ["joi/**"]
paths: ["joi/**", ".github/workflows/publish-npm-joi.yml"]
jobs:
build-and-publish-plugins:
environment: production
Expand Down Expand Up @@ -45,7 +45,7 @@ jobs:
node-version: "20.x"
registry-url: "https://registry.npmjs.org"

- run: cd joi && yarn install && yarn build
- run: cd joi && corepack enable && corepack prepare [email protected] --activate && yarn --version && yarn config set -H enableImmutableInstalls false && yarn install && yarn build

- run: cd joi && yarn publish --access public
if: github.event_name == 'push'
Expand Down
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ error.log
node_modules
*.tgz
!charts/server/charts/*.tgz
yarn.lock
dist
build
.DS_Store
Expand Down Expand Up @@ -48,3 +47,7 @@ coverage
test_results.html
*.tsbuildinfo
electron/shared/**

# docs
docs/yarn.lock
electron/.version.bak
3 changes: 3 additions & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
nmHoistingLimits: workspaces
nodeLinker: node-modules
checksumBehavior: update
31 changes: 15 additions & 16 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,23 @@ REPORT_PORTAL_DESCRIPTION ?= "Jan App report"
all:
@echo "Specify a target to run"

# Builds the UI kit
build-joi:
ifeq ($(OS),Windows_NT)
cd joi && yarn config set network-timeout 300000 && yarn install && yarn build
else
cd joi && yarn install && yarn build
endif
# Config yarn version

config-yarn:
corepack enable
corepack prepare [email protected] --activate
yarn --version
yarn config set -H enableImmutableInstalls false

# Installs yarn dependencies and builds core and extensions
install-and-build: build-joi
install-and-build: config-yarn
ifeq ($(OS),Windows_NT)
yarn config set network-timeout 300000
echo "skip"
endif
yarn global add [email protected]
yarn install
yarn build:joi
yarn build:core
yarn build:server
yarn install
yarn build:extensions

check-file-counts: install-and-build
Expand Down Expand Up @@ -117,9 +117,8 @@ build: check-file-counts

clean:
ifeq ($(OS),Windows_NT)
-powershell -Command "Get-ChildItem -Path . -Include node_modules, .next, dist, build, out, .turbo -Recurse -Directory | Remove-Item -Recurse -Force"
-powershell -Command "Get-ChildItem -Path . -Include package-lock.json -Recurse -File | Remove-Item -Recurse -Force"
-powershell -Command "Get-ChildItem -Path . -Include yarn.lock -Recurse -File | Remove-Item -Recurse -Force"
-powershell -Command "Get-ChildItem -Path . -Include node_modules, .next, dist, build, out, .turbo, .yarn -Recurse -Directory | Remove-Item -Recurse -Force"
-powershell -Command "Get-ChildItem -Path . -Include package-lock.json, tsconfig.tsbuildinfo -Recurse -File | Remove-Item -Recurse -Force"
-powershell -Command "Remove-Item -Recurse -Force ./pre-install/*.tgz"
-powershell -Command "Remove-Item -Recurse -Force ./extensions/*/*.tgz"
-powershell -Command "Remove-Item -Recurse -Force ./electron/pre-install/*.tgz"
Expand All @@ -131,8 +130,8 @@ else ifeq ($(shell uname -s),Linux)
find . -name "build" -type d -exec rm -rf '{}' +
find . -name "out" -type d -exec rm -rf '{}' +
find . -name ".turbo" -type d -exec rm -rf '{}' +
find . -name ".yarn" -type d -exec rm -rf '{}' +
find . -name "packake-lock.json" -type f -exec rm -rf '{}' +
find . -name "yarn.lock" -type f -exec rm -rf '{}' +
find . -name "package-lock.json" -type f -exec rm -rf '{}' +
rm -rf ./pre-install/*.tgz
rm -rf ./extensions/*/*.tgz
Expand All @@ -146,8 +145,8 @@ else
find . -name "build" -type d -exec rm -rf '{}' +
find . -name "out" -type d -exec rm -rf '{}' +
find . -name ".turbo" -type d -exec rm -rf '{}' +
find . -name ".yarn" -type d -exec rm -rf '{}' +
find . -name "package-lock.json" -type f -exec rm -rf '{}' +
find . -name "yarn.lock" -type f -exec rm -rf '{}' +
rm -rf ./pre-install/*.tgz
rm -rf ./extensions/*/*.tgz
rm -rf ./electron/pre-install/*.tgz
Expand Down
9 changes: 9 additions & 0 deletions ai.menlo.jan.desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
[Desktop Entry]
Name=Jan
Comment=Local AI Assistant that runs 100% offline
Exec=run.sh
Icon=ai.menlo.jan
Type=Application
Categories=Development;
Keywords=AI;Assistant;LLM;ChatGPT;Local;Offline;
StartupNotify=true
Loading
Loading