feat: add app workflow

Deeptrain-Community · Nov 28, 2023 · 9180bb5 · 9180bb5
1 parent e862bf4
commit 9180bb5
Show file tree

Hide file tree

Showing 6 changed files with 131 additions and 8 deletions.
diff --git a/.github/workflows/app.yaml b/.github/workflows/app.yaml
@@ -0,0 +1,110 @@
+name: Release App
+
+on:
+  workflow_dispatch:
+  release:
+    types: [published]
+
+jobs:
+  create-release:
+    permissions:
+      contents: write
+    runs-on: ubuntu-latest
+    outputs:
+      release_id: ${{ steps.create-release.outputs.result }}
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: setup node
+        uses: actions/setup-node@v3
+        with:
+          node-version: 16
+      - name: get version
+        run: |
+          cd app
+          echo "PACKAGE_VERSION=$(node -p "require('./src-tauri/tauri.conf.json').package.version")" >> $GITHUB_ENV
+      - name: create release
+        id: create-release
+        uses: actions/github-script@v6
+        with:
+          script: |
+            const { data } = await github.rest.repos.getLatestRelease({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+            })
+            return data.id
+
+  build-tauri:
+    needs: create-release
+    permissions:
+      contents: write
+    strategy:
+      fail-fast: false
+      matrix:
+        config:
+          - os: ubuntu-latest
+            arch: x86_64
+            rust_target: x86_64-unknown-linux-gnu
+          - os: macos-latest
+            arch: x86_64
+            rust_target: x86_64-apple-darwin
+          - os: macos-latest
+            arch: aarch64
+            rust_target: aarch64-apple-darwin
+          - os: windows-latest
+            arch: x86_64
+            rust_target: x86_64-pc-windows-msvc
+
+    runs-on: ${{ matrix.config.os }}
+    steps:
+      - uses: actions/checkout@v3
+      - name: setup node
+        uses: actions/setup-node@v3
+        with:
+          node-version: 16
+      - name: install Rust stable
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          targets: ${{ matrix.config.rust_target }}
+      - uses: Swatinem/rust-cache@v2
+        with:
+          key: ${{ matrix.config.rust_target }}
+      - name: install dependencies (ubuntu only)
+        if: matrix.config.os == 'ubuntu-latest'
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libappindicator3-dev librsvg2-dev patchelf
+      - name: install frontend dependencies
+        run: |
+          cd app
+          pnpm install
+      - uses: tauri-apps/tauri-action@v0
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
+          TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
+        with:
+          releaseId: ${{ needs.create-release.outputs.release_id }}
+          projectPath: ./app
+
+  publish-release:
+    permissions:
+      contents: write
+    runs-on: ubuntu-latest
+    needs: [create-release, build-tauri]
+
+    steps:
+      - name: publish release
+        id: publish-release
+        uses: actions/github-script@v6
+        env:
+          release_id: ${{ needs.create-release.outputs.release_id }}
+        with:
+          script: |
+            github.rest.repos.updateRelease({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              release_id: process.env.release_id,
+              draft: false,
+              prerelease: false
+            })
diff --git a/app/src-tauri/Cargo.toml b/app/src-tauri/Cargo.toml
@@ -17,7 +17,7 @@ tauri-build = { version = "1.5.0", features = [] }
 [dependencies]
 serde_json = "1.0"
 serde = { version = "1.0", features = ["derive"] }
-tauri = { version = "1.5.2", features = ["system-tray"] }
+tauri = { version = "1.5.2", features = [ "updater", "system-tray"] }
 
 [features]
 # this feature is used for production builds or when `devPath` points to the filesystem and the built-in dev server is disabled.

diff --git a/app/src-tauri/tauri.conf.json b/app/src-tauri/tauri.conf.json
@@ -1,14 +1,14 @@
 {
   "$schema": "../node_modules/@tauri-apps/cli/schema.json",
   "build": {
-    "beforeBuildCommand": "pnpm build",
+    "beforeBuildCommand": "pnpm build --mode deeptrain",
     "beforeDevCommand": "pnpm dev",
     "devPath": "http://localhost:5173",
     "distDir": "../dist"
   },
   "package": {
     "productName": "chatnio",
-    "version": "0.1.0"
+    "version": "3.6.0"
   },
   "tauri": {
     "allowlist": {
@@ -51,7 +51,15 @@
       "csp": null
     },
     "updater": {
-      "active": false
+      "active": true,
+      "endpoints": [
+        "https://github.com/Deeptrain-Community/chatnio/releases/latest/download/latest.json"
+      ],
+      "dialog": false,
+      "windows": {
+        "installMode": "passive"
+      },
+      "pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IDExREFBNEEwODA0MzIwOTYKUldTV0lFT0FvS1RhRWJSc1VTMFluOVl6VGFVNThyaVhyLyt4TnhrbTlBUHYyRWZWRXgzSDYrWGEK"
     },
     "windows": [
       {

diff --git a/app/src/dialogs/SubscriptionDialog.tsx b/app/src/dialogs/SubscriptionDialog.tsx
@@ -143,7 +143,8 @@ function SubscriptionDialog() {
                     </div>
                     <div>
                       <ImagePlus className={`h-4 w-4 mr-1`} />
-                      {t("sub.plan-midjourney", { times: 5 })}
+                      {t("sub.plan-midjourney", { times: 25 })}
+                      <Tips content={t("sub.plan-midjourney-desc")} />
                     </div>
                     <div>
                       <BookText className={`h-4 w-4 mr-1`} />
@@ -172,7 +173,8 @@ function SubscriptionDialog() {
                     </div>
                     <div>
                       <ImagePlus className={`h-4 w-4 mr-1`} />
-                      {t("sub.plan-midjourney", { times: 10 })}
+                      {t("sub.plan-midjourney", { times: 50 })}
+                      <Tips content={t("sub.plan-midjourney-desc")} />
                     </div>
                     <div>
                       <BookText className={`h-4 w-4 mr-1`} />

diff --git a/app/src/i18n.ts b/app/src/i18n.ts
@@ -148,6 +148,7 @@ const resources = {
         "free-sharing": "对话分享功能",
         "free-api": "API 调用",
         "plan-midjourney": "Midjourney 每日绘图 {{times}} 次",
+        "plan-midjourney-desc": "Midjourney 快速出图模式",
         "plan-gpt4": "GPT-4 每日请求 {{times}} 次",
         "plan-gpt4-desc": "包含 GPT 4 Turbo, GPT 4V, GPT 4 DALLE",
         "plan-claude": "Claude 100k 每日请求 {{times}} 次",
@@ -506,6 +507,7 @@ const resources = {
         "free-sharing": "conversation sharing",
         "free-api": "API calls",
         "plan-midjourney": "Midjourney {{times}} image generation per day",
+        "plan-midjourney-desc": "Midjourney Quick Image Generation",
         "plan-gpt4": "GPT-4 {{times}} requests per day",
         "plan-gpt4-desc": "including GPT 4 Turbo, GPT 4V, GPT 4 DALLE",
         "plan-claude": "Claude 100k {{times}} requests per day",
@@ -877,6 +879,7 @@ const resources = {
         "free-sharing": "общий доступ к разговорам",
         "free-api": "API вызовы",
         "plan-midjourney": "Midjourney {{times}} генерация изображений в день",
+        "plan-midjourney-desc": "Быстрая генерация изображений Midjourney",
         "plan-gpt4": "GPT-4 {{times}} запросов в день",
         "plan-gpt4-desc": "включая GPT 4 Turbo, GPT 4V, GPT 4 DALLE",
         "plan-claude": "Claude 100k {{times}} запросов в день",

diff --git a/auth/plan.go b/auth/plan.go
@@ -45,7 +45,7 @@ var Plans = []Plan{
 		Usage: []PlanUsage{
 			{Id: "gpt-4", Value: 50, Including: globals.IsGPT4NativeModel},
 			{Id: "claude-100k", Value: 100, Including: globals.IsClaude100KModel},
-			{Id: "midjourney", Value: 5, Including: globals.IsMidjourneyFastModel},
+			{Id: "midjourney", Value: 25, Including: globals.IsMidjourneyFastModel},
 		},
 	},
 	{
@@ -54,7 +54,7 @@ var Plans = []Plan{
 		Usage: []PlanUsage{
 			{Id: "gpt-4", Value: 100, Including: globals.IsGPT4NativeModel},
 			{Id: "claude-100k", Value: 200, Including: globals.IsClaude100KModel},
-			{Id: "midjourney", Value: 10, Including: globals.IsMidjourneyFastModel},
+			{Id: "midjourney", Value: 50, Including: globals.IsMidjourneyFastModel},
 		},
 	},
 	{