diff --git a/.github/workflows/jan-electron-linter-and-test.yml b/.github/workflows/jan-electron-linter-and-test.yml index 0924600e6..36f7d6556 100644 --- a/.github/workflows/jan-electron-linter-and-test.yml +++ b/.github/workflows/jan-electron-linter-and-test.yml @@ -34,6 +34,8 @@ on: - 'Makefile' - 'extensions/**' - 'core/**' + - 'src-tauri/**' + - 'web-app/**' - '!README.md' jobs: @@ -305,53 +307,53 @@ jobs: path: electron/playwright-report/ retention-days: 2 - coverage-check: - runs-on: ubuntu-latest - needs: base_branch_cov - continue-on-error: true - 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 - uses: actions/checkout@v3 - with: - fetch-depth: 0 + # coverage-check: + # runs-on: ubuntu-latest + # needs: base_branch_cov + # continue-on-error: true + # 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 + # uses: actions/checkout@v3 + # with: + # fetch-depth: 0 - - name: Installing node - uses: actions/setup-node@v3 - with: - node-version: 20 + # - name: Installing node + # uses: actions/setup-node@v3 + # with: + # node-version: 20 - - name: Install yarn - run: npm install -g yarn + # - name: Install yarn + # run: npm install -g yarn - - name: 'Cleanup cache' - continue-on-error: true - run: | - rm -rf ~/jan - make clean + # - name: 'Cleanup cache' + # continue-on-error: true + # run: | + # rm -rf ~/jan + # make clean - - name: Download code coverage report from base branch - uses: actions/download-artifact@v4 - with: - name: ref-lcov.info + # - name: Download code coverage report from base branch + # uses: actions/download-artifact@v4 + # with: + # name: ref-lcov.info - - name: Linter and test coverage - run: | - export DISPLAY=$(w -h | awk 'NR==1 {print $2}') - echo -e "Display ID: $DISPLAY" - make lint - yarn build:test - yarn test:coverage + # - name: Linter and test coverage + # run: | + # export DISPLAY=$(w -h | awk 'NR==1 {print $2}') + # echo -e "Display ID: $DISPLAY" + # make lint + # yarn build:test + # yarn test:coverage - - name: Generate Code Coverage report - id: code-coverage - uses: barecheck/code-coverage-action@v1 - with: - github-token: ${{ secrets.GITHUB_TOKEN }} - lcov-file: './coverage/lcov.info' - base-lcov-file: './lcov.info' - send-summary-comment: true - show-annotations: 'warning' + # - name: Generate Code Coverage report + # id: code-coverage + # uses: barecheck/code-coverage-action@v1 + # with: + # github-token: ${{ secrets.GITHUB_TOKEN }} + # lcov-file: './coverage/lcov.info' + # base-lcov-file: './lcov.info' + # send-summary-comment: true + # show-annotations: 'warning' test-on-ubuntu-pr-target: runs-on: ubuntu-latest diff --git a/package.json b/package.json index 6a758a403..53de04f95 100644 --- a/package.json +++ b/package.json @@ -29,8 +29,8 @@ "install:cortex": "run-script-os", "download:bin": "node ./scripts/download-bin.mjs", "dev:tauri": "yarn build:icon && yarn copy:assets:tauri && tauri dev", - "build:tauri:linux:win32": "yarn download:bin && yarn install:cortex && yarn build:icon && yarn copy:assets:tauri && yarn tauri build --verbose", - "build:tauri:darwin": "yarn install:cortex && yarn build:icon && yarn copy:assets:tauri && yarn tauri build --verbose --target universal-apple-darwin", + "build:tauri:linux:win32": "yarn download:bin && yarn install:cortex && yarn build:icon && yarn copy:assets:tauri && yarn tauri build", + "build:tauri:darwin": "yarn install:cortex && yarn build:icon && yarn copy:assets:tauri && yarn tauri build --target universal-apple-darwin", "build:tauri": "run-script-os", "build:icon": "tauri icon ./src-tauri/icons/icon.png", "build:server": "cd server && yarn build",