diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml index a0c5b028..a73a162f 100644 --- a/.github/workflows/pipeline.yml +++ b/.github/workflows/pipeline.yml @@ -1,4 +1,4 @@ -name: Continuous integration +name: Continuous Integration on: pull_request: @@ -6,40 +6,16 @@ on: types: [opened, synchronize] jobs: - - avoid_reduncy: + cancel_previous: name: Cancel previous redundant builds runs-on: ubuntu-22.04 steps: - - name: Cancel previous redundant builds - uses: styfle/cancel-workflow-action@0.9.1 + - uses: styfle/cancel-workflow-action@0.9.1 with: access_token: ${{ github.token }} - install_dependencies: - name: Install dependencies - runs-on: ubuntu-22.04 - steps: - - name: Checkout git repository - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - - uses: pnpm/action-setup@v2 - with: - version: 8 - - - name: Set up node - uses: actions/setup-node@v4 - with: - node-version: '20' - cache: 'pnpm' - - - name: Install dependencies - run: npm i --ignore-scripts - build: - needs: [install_dependencies] + needs: cancel_previous name: Build app runs-on: ubuntu-22.04 steps: @@ -48,10 +24,10 @@ jobs: with: fetch-depth: 0 - - name: Set up node - uses: actions/setup-node@v4 - with: - node-version: '20' + - name: Install Bun + uses: oven-sh/setup-bun@v1 - - name: Build app - run: pnpm run build \ No newline at end of file + - name: Install dependencies and build + run: | + bun install + bun run build diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 814f1ebd..85c9d2a0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -25,37 +25,36 @@ jobs: steps: - uses: actions/checkout@v4 - - name: setup node + - name: Setup Node uses: actions/setup-node@v4 with: node-version: lts/* - - uses: pnpm/action-setup@v4 - with: - version: 9 + - name: Install Bun + uses: oven-sh/setup-bun@v1 - - name: install Rust stable + - name: Install Rust stable uses: dtolnay/rust-toolchain@stable with: - # Those targets are only used on macos runners so it's in an `if` to slightly speed up windows and linux builds. + # These targets are only used on macOS runners, so it's conditional to speed up other builds targets: ${{ matrix.platform == 'macos-latest' && 'aarch64-apple-darwin,x86_64-apple-darwin' || '' }} - - name: install dependencies (ubuntu only) + - name: Install dependencies (Ubuntu only) if: matrix.platform == 'ubuntu-22.04' run: | sudo apt-get update sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf - - name: install frontend dependencies - run: pnpm install # change this to npm, pnpm or bun depending on which one you use. + - name: Install frontend dependencies + run: bun install - uses: tauri-apps/tauri-action@v0 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - tagName: app-v__VERSION__ # the action automatically replaces \_\_VERSION\_\_ with the app version. + tagName: app-v__VERSION__ # the action automatically replaces __VERSION__ with the app version releaseName: 'App v__VERSION__' releaseBody: 'See the assets to download this version and install.' releaseDraft: true prerelease: false - args: ${{ matrix.args }} \ No newline at end of file + args: ${{ matrix.args }} diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 0282a471..4fc8f37b 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -6,8 +6,8 @@ "build": { "frontendDist": "../dist", "devUrl": "http://localhost:5173", - "beforeDevCommand": "pnpm dev", - "beforeBuildCommand": "pnpm build" + "beforeDevCommand": "bun dev", + "beforeBuildCommand": "bun run build" }, "app": { "windows": [