CI: modify ci

KangLin · Feb 6, 2024 · cdf2758 · cdf2758
1 parent 0cd5158
commit cdf2758
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -107,7 +107,7 @@ jobs:
         working-directory: ${{github.workspace}}/build
         run: |
           ./install/bin/Calendar.sh \
-               -f "${{github.workspace}}/update_macos.${{matrix.qt_version}}.json" \
+               -f "${{github.workspace}}/build/update_macos_${{matrix.qt_version}}.json" \
                --foc 1 \
                --md5 ${MD5} \
                -n "Calendar_${{env.Calendar_VERSION}}_macos_qt${{matrix.qt_version}}.zip" \
@@ -121,7 +121,7 @@ jobs:
           name: ${{ env.artifact_name }}
           path: |
             ${{github.workspace}}/build/Calendar_${{env.Calendar_VERSION}}_macos_qt${{matrix.qt_version}}.zip
-            ${{github.workspace}}/update_macos.${{matrix.qt_version}}.json
+            ${{github.workspace}}/build/update_macos_${{matrix.qt_version}}.json
 
 #    - name: Upload To Github Release
 #      if: ${{ matrix.BUILD_TYPE == 'Release' && startsWith(github.ref, 'refs/tags/') }}

diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -105,7 +105,8 @@ jobs:
           export DISPLAY=:99.0
           /opt/Calendar/bin/Calendar.sh \
                -f "${{github.workspace}}/version.json" \
-               --foc 0
+               --foc 0 \
+               --pv ${{env.Calendar_VERSION}}
 
       - name:  Update artifact
         if: ${{ matrix.BUILD_TYPE == 'Release' }}

diff --git a/App/main.cpp b/App/main.cpp
@@ -30,15 +30,15 @@ int main(int argc, char *argv[])
     && QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
     QtAndroid::hideSplashScreen();
 #endif
-    
+
     QApplication a(argc, argv);
     a.setApplicationVersion(Calendar_VERSION);
     a.setApplicationName("Calendar");
-    
+
     QSettings set(RabbitCommon::CDir::Instance()->GetFileUserConfigure(),
                   QSettings::IniFormat);
 
-    QTranslator tApp, tTasks, tLunarCalendar;
+    QTranslator tApp;
     bool bRet = tApp.load(RabbitCommon::CDir::Instance()->GetDirTranslations()
               + QDir::separator() + a.applicationName() + "App_"
               + QLocale::system().name() + ".qm");
@@ -54,9 +54,9 @@ int main(int argc, char *argv[])
                 << "android.permission.BLUETOOTH";
     RabbitCommon::CTools::Instance()->AndroidRequestPermission(permissions);
 #endif
-    
+
     a.setApplicationDisplayName(QObject::tr("Calendar"));
-    
+
 #ifdef RABBITCOMMON
     CFrmUpdater *pUpdate = new CFrmUpdater();
     QIcon icon = QIcon::fromTheme("calendar");