Merge remote-tracking branch 'origin/develop/refactory-linyaps-reposi…

…tory' into release
deepin-community · Sep 29, 2024 · cbc1b37 · cbc1b37
2 parents 9c315f4 + 979f693
commit cbc1b37
Show file tree

Hide file tree

Showing 35 changed files with 1,116 additions and 154 deletions.
diff --git a/.github/workflows/backup-to-gitlab.yml b/.github/workflows/backup-to-gitlab.yml
@@ -0,0 +1,12 @@
+name: backup to gitlab
+on: [push]
+
+concurrency:
+  group: ${{ github.workflow }}
+  cancel-in-progress: true
+
+jobs:
+  backup-to-gitlabwh:
+    uses: deepin-community/.github/.github/workflows/backup-to-gitlabwh.yml@release
+    secrets:
+      BRIDGETOKEN: ${{ secrets.BRIDGETOKEN }}
diff --git a/.github/workflows/call-auto-tag.yml b/.github/workflows/call-auto-tag.yml
@@ -12,5 +12,6 @@ concurrency:
 
 jobs:
   auto_tag:
-    uses: linuxdeepin/.github/.github/workflows/auto-tag.yml@master
-    secrets: inherit
+    uses: deepin-community/.github/.github/workflows/auto-tag.yml@release
+    secrets:
+      APP_PRIVATE_KEY: ${{ secrets.APP_PRIVATE_KEY }}
diff --git a/.github/workflows/call-chatOps.yml b/.github/workflows/call-chatOps.yml
@@ -0,0 +1,9 @@
+name: chatOps
+on:
+  issue_comment:
+    types: [created]
+
+jobs:
+  chatopt:
+    uses: deepin-community/.github/.github/workflows/chatOps.yml@release
+    secrets: inherit
diff --git a/.github/workflows/call-commitlint.yml b/.github/workflows/call-commitlint.yml
diff --git a/.github/workflows/call-license-check.yml b/.github/workflows/call-license-check.yml
diff --git a/.github/workflows/cppcheck.yml b/.github/workflows/cppcheck.yml
diff --git a/api/dbus/org.deepin.linglong.Migrate1.xml b/api/dbus/org.deepin.linglong.Migrate1.xml
@@ -10,5 +10,9 @@ SPDX-License-Identifier: LGPL-3.0-or-later
             <annotation name="org.freedesktop.DBus.Description"
                 value="This method is a blocking method that retruns only only when package manager is available." />
         </method>
+        <signal name="MigrateDone">
+            <arg name="code" type="i" />
+            <arg name="message" type="s" />
+        </signal>
     </interface>
 </node>
diff --git a/api/dbus/org.deepin.linglong.PackageManager1.xml b/api/dbus/org.deepin.linglong.PackageManager1.xml
@@ -36,6 +36,10 @@ SPDX-License-Identifier: LGPL-3.0-or-later
       <arg direction="out" name="result" type="a{sv}" />
       <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QVariantMap" />
     </method>
+    <method name="Migrate">
+      <arg direction="out" name="result" type="a{sv}" />
+      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QVariantMap" />
+    </method>
     <method name="CancelTask">
       <arg name="taskID" type="s" direction="in" />
     </method>

diff --git a/api/schema/v1.json b/api/schema/v1.json
@@ -71,6 +71,45 @@
         }
       }
     },
+    "InteractionRequest": {
+      "description": "structured message which inspired by freedesktop Notification Spec.\nrefer: https://specifications.freedesktop.org/notification-spec/latest/protocol.html#id-1.10.3.3.4\n",
+      "type": "object",
+      "required": [
+        "appName",
+        "summary",
+        "timeout"
+      ],
+      "properties": {
+        "appName": {
+          "type": "string"
+        },
+        "summary": {
+          "type": "string"
+        },
+        "body": {
+          "type": "string"
+        },
+        "actions": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "timeout": {
+          "type": "integer"
+        }
+      }
+    },
+    "InteractionReply": {
+      "description": "message from user reply",
+      "type": "object",
+      "properties": {
+        "action": {
+          "description": "choice which in requested actions",
+          "type": "string"
+        }
+      }
+    },
     "OCIConfigurationPatch": {
       "title": "OCIConfigurationPatch",
       "description": "oci configuration patch",
@@ -622,6 +661,9 @@
         }
       }
     },
+    "PackageManager1MigrateResult": {
+      "$ref": "#/$defs/CommonResult"
+    },
     "PackageManager1InstallLayerFDResult": {
       "$ref": "#/$defs/CommonResult"
     },
@@ -789,6 +831,14 @@
         "layers"
       ],
       "properties": {
+        "migrating_stage": {
+          "type": "array",
+          "description": "solutions should apply to migrating progress",
+          "minItems": 1,
+          "items": {
+            "type": "integer"
+          }
+        },
         "version": {
           "type": "string",
           "description": "version of storage"
@@ -837,6 +887,12 @@
     "ApplicationConfigurationPermissions": {
       "$ref": "#/$defs/ApplicationConfigurationPermissions"
     },
+    "InteractionRequest": {
+      "$ref": "#/$defs/InteractionRequest"
+    },
+    "InteractionReply": {
+      "$ref": "#/$defs/InteractionReply"
+    },
     "OCIConfigurationPatch": {
       "$ref": "#/$defs/OCIConfigurationPatch"
     },
@@ -870,6 +926,9 @@
     "CommonResult": {
       "$ref": "#/$defs/CommonResult"
     },
+    "PackageManager1MigrateResult": {
+      "$ref": "#/$defs/PackageManager1MigrateResult"
+    },
     "PackageManager1InstallLayerFDResult": {
       "$ref": "#/$defs/PackageManager1InstallLayerFDResult"
     },