Merge remote-tracking branch 'upstream/master' into dev

.workflow/dtk-build-release-tag-20220425.yml

@@ -14,31 +14,25 @@ stages:
     trigger: auto
     executor: []
     steps:
-      - step: build@gcc
+      - step: build@nodejs
-        name: build_gcc
+        name: build_dtk
-        displayName: GCC 构建
+        displayName: DTK构建
-        gccVersion: '9.4'
+        nodeVersion: 14.16.0
         commands:
-          - sed -i 's/archive.ubuntu.com/mirrors.ustc.edu.cn/g' /etc/apt/sources.list
-          - '# 换源'
-          - apt update
-          - echo "正在准备Debian 10环境..."
-          - apt install git -y >/dev/null 2>&1
           - git clone https://gitlink.org.cn/shenmo7192/debian-10-container.git
           - mv debian-10-container/Debian-10.tar.xz /mnt
+          - rm -rf debian-10-container
+          - WORK_DIR=`pwd`
           - cd /mnt/
           - tar -xf Debian-10.tar.xz
           - cd Debian-10
           - wget https://gitee.com/deepin-community-store/repo_auto_update_script/raw/master/spark-build.sh
           - chmod +x spark-build.sh
+          - mkdir  build-spark
+          - cp -r $WORK_DIR build-spark/spark-store
           - echo "进入Debian 10环境"
           - chroot /mnt/Debian-10 /bin/bash /spark-build.sh
           - cd /mnt/Debian-10/build-spark
-          - 'mkdir target '
-          - for f in $(find . -type f -name "*.deb")
-          - do
-          - '    mv $f target'
-          - done
         artifacts:
           - name: BUILD_ARTIFACT
             path:

debian/changelog

@@ -1,3 +1,10 @@
+spark-store (3.1.6) stable; urgency=medium
+
+* 修复部分情况下无法选中正确的镜像源的问题
+* 合入3.1.5以来的各项修改
+
+-- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
 spark-store (3.1.5-5) stable; urgency=medium
 
 * 从所有镜像源中选取最快镜像源高速下载

src/main.cpp

@@ -30,7 +30,7 @@ int main(int argc, char *argv[])
      DAboutDialog dialog;
       a.setAboutDialog(&dialog);
       dialog.setLicense(QObject::tr("We publish this program under GPL V3"));
-      dialog.setVersion(DApplication::buildVersion("Version 3.1.5-5"));
+      dialog.setVersion(DApplication::buildVersion("Version 3.1.6"));
       dialog.setProductIcon(QIcon::fromTheme("spark-store"));  // 设置Logo
       dialog.setProductName(QLabel::tr("Spark Store"));
       dialog.setDescription(
@@ -51,7 +51,7 @@ int main(int argc, char *argv[])
     a.setOrganizationName("spark-union");
     a.setOrganizationDomain("https://www.deepinos.org/");
     a.setApplicationName("Spark Store");    //不需要翻译，否则 ~/.local/share/ 下文件夹名称也被翻译为中文
-    a.setApplicationVersion(DApplication::buildVersion("3.1.5-5"));
+    a.setApplicationVersion(DApplication::buildVersion("3.1.6"));
     a.setApplicationAcknowledgementPage("https://gitee.com/deepin-community-store/spark-store");
     a.setApplicationDescription(
                 QObject::tr(