Merge pull request #2682 from janhq/dev

Release cut 0.4.11
janhq · Apr 11, 2024 · 9e7bdc7 · 9e7bdc7
2 parents 2a6f774 + c0949b2
commit 9e7bdc7
Show file tree

Hide file tree

Showing 232 changed files with 4,943 additions and 6,637 deletions.
diff --git a/.github/workflows/clean-cloudflare-r2.yml b/.github/workflows/clean-cloudflare-r2.yml
diff --git a/.github/workflows/jan-electron-linter-and-test.yml b/.github/workflows/jan-electron-linter-and-test.yml
@@ -38,17 +38,57 @@ on:
 
 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]
  steps:
- - name: "Cleanup build folder"
+ - name: Getting the repo
+ uses: actions/checkout@v3
+ with:
+ fetch-depth: 0
+
+ - name: Installing node
+ uses: actions/setup-node@v3
+ with:
+ node-version: 20
+
+ - name: "Cleanup cache"
+ continue-on-error: true
+ run: |
+ make clean
+
+ - name: Get Commit Message for PR
+ if : github.event_name == 'pull_request'
+ run: |
+ echo "REPORT_PORTAL_DESCRIPTION=${{github.event.after}})" >> $GITHUB_ENV
+
+ - name: Get Commit Message for push event
+ if : github.event_name == 'push'
+ run: |
+ echo "REPORT_PORTAL_DESCRIPTION=${{github.sha}})" >> $GITHUB_ENV
+
+ - name: "Config report portal"
  run: |
- ls -la ./
- rm -rf ./* || true
- rm -rf ./.??* || true
- ls -la ./
- rm -rf ~/Library/Application\ Support/jan
+ 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]
+ steps:
  - name: Getting the repo
  uses: actions/checkout@v3
+ with:
+ fetch-depth: 0
 
  - name: Installing node
  uses: actions/setup-node@v3
@@ -62,29 +102,24 @@ 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"
 
  test-on-windows:
- if: github.event_name == 'push'
+ if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
  strategy:
  fail-fast: false
  matrix:
  antivirus-tools: ['mcafee', 'default-windows-security','bit-defender']
  runs-on: windows-desktop-${{ matrix.antivirus-tools }}
  steps:
- - name: Clean workspace
- run: |
- Remove-Item -Path "\\?\$(Get-Location)\*" -Force -Recurse
- $path = "$Env:APPDATA\jan"
- if (Test-Path $path) {
- Remove-Item "\\?\$path" -Recurse -Force
- } else {
- Write-Output "Folder does not exist."
- }
  - name: Getting the repo
  uses: actions/checkout@v3
+ with:
+ fetch-depth: 0
 
  - name: Installing node
  uses: actions/setup-node@v3
@@ -97,26 +132,36 @@ jobs:
  continue-on-error: true
  run: |
  make clean
+ 
+ - name: Get Commit Message for push event
+ if : github.event_name == 'push'
+ shell: bash
+ 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: 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'
+ if: (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository)
  runs-on: windows-desktop-default-windows-security
  steps:
- - name: Clean workspace
- run: |
- Remove-Item -Path "\\?\$(Get-Location)\*" -Force -Recurse
- $path = "$Env:APPDATA\jan"
- if (Test-Path $path) {
- Remove-Item "\\?\$path" -Recurse -Force
- } else {
- Write-Output "Folder does not exist."
- }
  - name: Getting the repo
  uses: actions/checkout@v3
+ with:
+ fetch-depth: 0
 
  - name: Installing node
  uses: actions/setup-node@v1
@@ -130,23 +175,111 @@ jobs:
  run: |
  make clean
 
+ - name: Get Commit Message for PR
+ if : github.event_name == 'pull_request'
+ shell: bash
+ 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: 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
+ steps:
+ - name: Getting the repo
+ uses: actions/checkout@v3
+ with:
+ fetch-depth: 0
+
+ - name: Installing node
+ uses: actions/setup-node@v1
+ with:
+ node-version: 20
+
+ # Clean cache, continue on error
+ - name: "Cleanup cache"
+ shell: powershell
+ continue-on-error: true
+ run: |
+ make clean
+
+ - 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]
+ 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: "Cleanup build folder"
+ - name: Getting the repo
+ uses: actions/checkout@v3
+ with:
+ fetch-depth: 0
+
+ - name: Installing node
+ uses: actions/setup-node@v3
+ with:
+ node-version: 20
+
+ - name: "Cleanup cache"
+ continue-on-error: true
+ run: |
+ make clean
+
+ - name: Get Commit Message for PR
+ if : github.event_name == 'pull_request'
+ run: |
+ echo "REPORT_PORTAL_DESCRIPTION=${{github.event.after}}" >> $GITHUB_ENV
+
+ - name: Get Commit Message for push event
+ if : github.event_name == 'push'
  run: |
- ls -la ./
- rm -rf ./* || true
- rm -rf ./.??* || true
- ls -la ./
- rm -rf ~/.config/jan
+ 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: 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 }}"
+
+ test-on-ubuntu-pr-target:
+ runs-on: [self-hosted, Linux, ubuntu-desktop]
+ if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository
+ steps:
  - name: Getting the repo
  uses: actions/checkout@v3
+ with:
+ fetch-depth: 0
 
  - name: Installing node
  uses: actions/setup-node@v3
@@ -162,4 +295,6 @@ jobs:
  run: |
  export DISPLAY=$(w -h | awk 'NR==1 {print $2}')
  echo -e "Display ID: $DISPLAY"
- make test
+ npm config set registry https://registry.npmjs.org --global
+ yarn config set registry https://registry.npmjs.org --global
+ make test
diff --git a/.github/workflows/template-noti-discord-and-update-url-readme.yml b/.github/workflows/template-noti-discord-and-update-url-readme.yml
@@ -47,27 +47,11 @@ jobs:
  with:
  args: |
  Jan App ${{ inputs.build_reason }} build artifact version {{ VERSION }}:
- - Windows: https://delta.jan.ai/latest/jan-win-x64-{{ VERSION }}.exe
- - macOS Intel: https://delta.jan.ai/latest/jan-mac-x64-{{ VERSION }}.dmg
- - macOS Apple Silicon: https://delta.jan.ai/latest/jan-mac-arm64-{{ VERSION }}.dmg
- - Linux Deb: https://delta.jan.ai/latest/jan-linux-amd64-{{ VERSION }}.deb
- - Linux AppImage: https://delta.jan.ai/latest/jan-linux-x86_64-{{ VERSION }}.AppImage
+ - Windows: https://app.jan.ai/download/nightly/win-x64
+ - macOS Intel: https://app.jan.ai/download/nightly/mac-x64
+ - macOS Apple Silicon: https://app.jan.ai/download/nightly/mac-arm64
+ - Linux Deb: https://app.jan.ai/download/nightly/linux-amd64-deb
+ - Linux AppImage: https://app.jan.ai/download/nightly/linux-amd64-appimage
  - Github action run: https://github.com/janhq/jan/actions/runs/{{ GITHUB_RUN_ID }}
  env:
- DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
-
- - name: Update README.md with artifact URL
- run: |
- sed -i "s|<a href='https://delta.jan.ai/latest/jan-win-x64-.*'>|<a href='https://delta.jan.ai/latest/jan-win-x64-${{ inputs.new_version }}.exe'>|" README.md
- sed -i "s|<a href='https://delta.jan.ai/latest/jan-mac-x64-.*'>|<a href='https://delta.jan.ai/latest/jan-mac-x64-${{ inputs.new_version }}.dmg'>|" README.md
- sed -i "s|<a href='https://delta.jan.ai/latest/jan-mac-arm64-.*'>|<a href='https://delta.jan.ai/latest/jan-mac-arm64-${{ inputs.new_version }}.dmg'>|" README.md
- sed -i "s|<a href='https://delta.jan.ai/latest/jan-linux-amd64-.*'>|<a href='https://delta.jan.ai/latest/jan-linux-amd64-${{ inputs.new_version }}.deb'>|" README.md
- sed -i "s|<a href='https://delta.jan.ai/latest/jan-linux-x86_64-.*'>|<a href='https://delta.jan.ai/latest/jan-linux-x86_64-${{ inputs.new_version }}.AppImage'>|" README.md
- cat README.md
- git config --global user.email "[email protected]"
- git config --global user.name "Service Account"
- git add README.md
- git commit -m "${GITHUB_REPOSITORY}: Update README.md with nightly build artifact URL"
- git -c http.extraheader="AUTHORIZATION: bearer ${{ secrets.PAT_SERVICE_ACCOUNT }}" push origin HEAD:${{ inputs.push_to_branch }}
- env:
- GITHUB_RUN_ID: ${{ github.run_id }}
+ DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
diff --git a/.github/workflows/update-release-url.yml b/.github/workflows/update-release-url.yml