Modify ci

KangLin · Feb 6, 2024 · e58e186 · e58e186
1 parent 35d0e46
commit e58e186
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 10 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -77,7 +77,7 @@ jobs:
           arch: 'gcc_64'
           set-env: false
           cache: true
-          cache-key-prefix: install-qt-action
+          cache-key-prefix: cached_qt
 
       - name: Install Qt of android
         uses: jurplel/install-qt-action@v3
@@ -96,7 +96,7 @@ jobs:
           modules: '${{env.qt_modules}}' # optional. See: https://ddalcino.github.io/aqt-list-server/
           # Whether or not to actually download Qt
           cache: true
-          cache-key-prefix: install-qt-action
+          cache-key-prefix: cached_qt
 
       - name: run vcpkg
         if: false

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -85,11 +85,14 @@ jobs:
           echo "文件签名:" >> ${{github.workspace}}/Notes.md
           for file in *
           do
-              #echo $file
-              if [ -f $file ] && [ "${file##*.}" != "xml" ]; then
-                  #echo "md5sum $file"
-                  md5sum $file > $file.md5sum
-                  cat $file.md5sum >> ${{github.workspace}}/Notes.md
+              echo "$file"
+              if [ -f $file ]; then
+                  if [ "${file##*.}" != "xml" ] && [ "${file##*.}" != "json" ]; then
+                      md5sum $file > $file.md5sum
+                      cat $file.md5sum >> ${{github.workspace}}/Notes.md
+                  fi
+              else
+                 rm -fr $file
               fi
           done
 

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -78,7 +78,7 @@ jobs:
           arch: '${{matrix.qt_arch}}' # optional
           modules: '${{env.qt_modules}}' # optional. See: https://ddalcino.github.io/aqt-list-server/
           cache: true
-          cache-key-prefix: install-qt-action
+          cache-key-prefix: cached_qt
 
       - name: git clone RabbitCommon
         working-directory: ${{env.SOURCE_DIR}}

diff --git a/.github/workflows/msvc.yml b/.github/workflows/msvc.yml
@@ -92,7 +92,7 @@ jobs:
           arch: '${{matrix.qt_arch}}' # optional
           modules: '${{env.qt_modules}}' # optional. See: https://ddalcino.github.io/aqt-list-server/
           cache: true
-          cache-key-prefix: install-qt-action
+          cache-key-prefix: cached_qt
 
       - name: git clone RabbitCommon
         working-directory: ${{env.SOURCE_DIR}}
@@ -131,7 +131,7 @@ jobs:
           name: ${{ env.artifact_name }}
           path: |
             ${{github.workspace}}\build\LunarCalendar_${{env.LunarCalendar_VERSION}}_${{matrix.triplet}}_qt${{matrix.qt_version}}_${{matrix.BUILD_TYPE}}.zip
-      
+
       - name: Build LunarCalendar application
         if: ${{ matrix.BUILD_TYPE == 'Release' && matrix.qt_version == '5.12.12' }}
         working-directory: ${{github.workspace}}\build_app
@@ -148,6 +148,7 @@ jobs:
               -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/build_app/install ^
               -DCMAKE_TOOLCHAIN_FILE=${{env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake ^
               -DVCPKG_VERBOSE=ON ^
+              -DBUILD_APP=ON ^
               -DX_VCPKG_APPLOCAL_DEPS_INSTALL=ON
           cmake --build . --config ${{ matrix.BUILD_TYPE }}
           cmake --build . --config ${{ matrix.BUILD_TYPE }} --target install
@@ -180,6 +181,7 @@ jobs:
               -DCMAKE_TOOLCHAIN_FILE=${{env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake ^
               -DVCPKG_VERBOSE=ON ^
               -DX_VCPKG_APPLOCAL_DEPS_INSTALL=ON
+          cmake --build . --config ${{ matrix.BUILD_TYPE }}
           cmake --build . --config ${{ matrix.BUILD_TYPE }} --target package
 
       - name: Update artifact for application