Merge branch 'dev' into release

jeot · jeot · commit f0cb3d0c8658 · 2025-05-16T13:29:41.000+03:30
diff --git a/.github/workflows/pre-publish-test.yml b/.github/workflows/pre-publish-test.yml
@@ -5,19 +5,19 @@ on:
     branches:
       - dev
 
-# This workflow will build your tauri app without uploading it anywhere.
-
 jobs:
   test-tauri:
+    permissions:
+      contents: write
     strategy:
       fail-fast: false
       matrix:
         include:
-          - platform: "macos-latest" # for Arm based macs (M1 and above).
+          - platform: "macos-latest"
             args: "--target aarch64-apple-darwin"
-          - platform: "macos-latest" # for Intel based macs.
+          - platform: "macos-latest"
             args: "--target x86_64-apple-darwin"
-          - platform: "ubuntu-22.04" # for Tauri v1 you could replace this with ubuntu-20.04.
+          - platform: "ubuntu-latest"
             args: ""
           - platform: "windows-latest"
             args: ""
@@ -26,33 +26,33 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: setup node
+      - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
           node-version: lts/*
 
-      - name: setup pnpm
+      - name: Setup pnpm
         uses: pnpm/action-setup@v4 # docs https://pnpm.io/continuous-integration#github-actions
 
-      - name: install Rust stable
-        uses: dtolnay/rust-toolchain@stable
+      - name: Set up Rust toolchain
+        uses: actions-rs/toolchain@v1
         with:
-          # Those targets are only used on macos runners so it's in an `if` to slightly speed up windows and linux builds.
-          targets: ${{ matrix.platform == 'macos-latest' && 'aarch64-apple-darwin,x86_64-apple-darwin' || '' }}
+          toolchain: stable
+          override: true
+          profile: minimal
+          target: ${{ matrix.platform == 'macos-latest' && 'x86_64-apple-darwin' || '' }}
 
-      - name: install dependencies (ubuntu only)
-        if: matrix.platform == 'ubuntu-22.04' # This must match the platform value defined above.
+      - name: Install dependencies (Linux only)
+        if: runner.os == 'Linux'
         run: |
-          sudo apt-get update
-          sudo apt-get install -y libwebkit2gtk-4.0-dev libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf
-        # webkitgtk 4.0 is for Tauri v1 - webkitgtk 4.1 is for Tauri v2.
-        # You can remove the one that doesn't apply to your app to speed up the workflow a bit.
+          sudo apt update
+          sudo apt install -y libfuse2 libgtk-3-dev libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev squashfs-tools 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: pnpm install
 
-      # If tagName and releaseId are omitted tauri-action will only build the app and won't try to upload any assets.
-      - uses: tauri-apps/tauri-action@v0
+      - name: Build and NOT publish
+        uses: tauri-apps/tauri-action@v0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -5,9 +5,6 @@ on:
     branches:
       - release
 
-# This is the example from the readme.
-# On each push to the `release` branch it will create or update a GitHub release, build your app, and upload the artifacts to the release.
-
 jobs:
   publish-tauri:
     permissions:
@@ -16,11 +13,11 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - platform: "macos-latest" # for Arm based macs (M1 and above).
+          - platform: "macos-latest"
             args: "--target aarch64-apple-darwin"
-          - platform: "macos-latest" # for Intel based macs.
+          - platform: "macos-latest"
             args: "--target x86_64-apple-darwin"
-          - platform: "ubuntu-22.04" # for Tauri v1 you could replace this with ubuntu-20.04.
+          - platform: "ubuntu-18.04"
             args: ""
           - platform: "windows-latest"
             args: ""
@@ -29,38 +26,35 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: setup node
+      - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
           node-version: lts/*
 
-      - name: setup pnpm
+      - name: Setup pnpm
         uses: pnpm/action-setup@v4 # docs https://pnpm.io/continuous-integration#github-actions
 
-      - name: install Rust stable
+      - name: Setup Rust
         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.
-          targets: ${{ matrix.platform == 'macos-latest' && 'aarch64-apple-darwin,x86_64-apple-darwin' || '' }}
 
-      - name: install dependencies (ubuntu only)
-        if: matrix.platform == 'ubuntu-22.04' # This must match the platform value defined above.
+      - name: Install dependencies (Linux only)
+        if: runner.os == 'Linux'
         run: |
-          sudo apt-get update
-          sudo apt-get install -y libwebkit2gtk-4.0-dev libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf
-        # webkitgtk 4.0 is for Tauri v1 - webkitgtk 4.1 is for Tauri v2.
-        # You can remove the one that doesn't apply to your app to speed up the workflow a bit.
+          sudo apt update
+          sudo apt install -y libfuse2 libgtk-3-dev libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev squashfs-tools 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: pnpm install
 
-      - uses: tauri-apps/tauri-action@v0
+      - name: Build and publish
+        uses: tauri-apps/tauri-action@v0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          tagName: thisweek-v__VERSION__ # the action automatically replaces \_\_VERSION\_\_ with the app version.
+          tagName: thisweek-v__VERSION__
           releaseName: "ThisWeek v__VERSION__"
-          releaseBody: "See the assets to download this version and install."
+          releaseBody: "See the assets below."
           releaseDraft: true
           prerelease: false
           args: ${{ matrix.args }}
+
diff --git a/build.sh b/build.sh
@@ -0,0 +1,3 @@
+# to resolve problem when building in arch-linux
+
+NO_STRIP=true pnpm tauri build
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "ThisWeek",
   "private": true,
-  "version": "0.4.0",
+  "version": "0.4.1",
   "type": "module",
   "scripts": {
     "dev": "vite",
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "thisweek"
-version = "0.4.0"
+version = "0.4.1"
 description = "A Weekly Task Manager with Yearly Objectives"
 authors = ["Shamim Keshani <sh.keshani@gmail.com>"]
 edition = "2021"
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
@@ -18,7 +18,7 @@
   },
   "productName": "ThisWeek",
   "mainBinaryName": "ThisWeek",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "identifier": "com.thisweek.dev",
   "plugins": {},
   "app": {

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+# to resolve problem when building in arch-linux`
	`2`	`+`
	`3`	`+NO_STRIP=true pnpm tauri build`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "ThisWeek",`
`3`	`3`	`"private": true,`
`4`		`- "version": "0.4.0",`
	`4`	`+ "version": "0.4.1",`
`5`	`5`	`"type": "module",`
`6`	`6`	`"scripts": {`
`7`	`7`	`"dev": "vite",`