CI: modify ci

KangLin · Feb 20, 2024 · f400cf4 · f400cf4
1 parent fe7bd08
commit f400cf4
Show file tree

Hide file tree

Showing 12 changed files with 18 additions and 917 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -14,7 +14,7 @@ jobs:
       matrix:
         BUILD_TYPE: [Release]
         qt_arch: [android_arm64_v8a, android_x86_64]
-        qt_version: [6.6.1]
+        qt_version: [6.6.2]
         include:
           - BUILD_TYPE: Release
             qt_arch: android_arm64_v8a
@@ -134,7 +134,7 @@ jobs:
           APK_FILE=`find . -name "android-*.apk"`
           cp $APK_FILE ChineseChessControl_${{env.ChineseChessControl_VERSION}}_${{matrix.qt_arch}}_qt${{matrix.qt_version}}_${{matrix.BUILD_TYPE}}.apk
           cmake --build . --config ${{matrix.BUILD_TYPE}} --target install
-          7z a ChineseChessControl_${{env.ChineseChessControl_VERSION}}_${{matrix.qt_arch}}_qt${{matrix.qt_version}}_${{matrix.BUILD_TYPE}}.zip install/*
+          7z a ChineseChessControl_${{env.ChineseChessControl_VERSION}}_${{matrix.qt_arch}}_qt${{matrix.qt_version}}_${{matrix.BUILD_TYPE}}.zip ./install/*
 
       - name: Update artifact
         #if: ${{ matrix.BUILD_TYPE == 'Release' }}

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -16,11 +16,11 @@ jobs:
       matrix:
         # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
         BUILD_TYPE: [Release, Debug]
-        qt_version: [6.5.1, 5.15.2, 5.12.12]
+        qt_version: [6.6.2, 5.15.2, 5.12.12]
         qt_arch: [clang_64]
         VCPKG_TARGET_TRIPLET: [x64-osx]
         include:
-          - qt_version: 6.5.1
+          - qt_version: 6.6.2
             qt_modules: 'qtscxml qtmultimedia qtimageformats'
 
           - qt_version: 5.15.2

diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml
@@ -53,9 +53,9 @@ jobs:
               mingw-w64-x86_64-make ^
               mingw-w64-x86_64-nsis ^
               mingw-w64-x86_64-gcc ^
-              mingw-w64-x86_64-qt6 ^
-              mingw-w64-x86_64-qt6-multimedia ^
-              mingw-w64-x86_64-qt6-svg ^
+              mingw-w64-x86_64-qt5 ^
+              mingw-w64-x86_64-qt5-multimedia ^
+              mingw-w64-x86_64-qt5-svg ^
               mingw-w64-x86_64-qtwebkit ^
               mingw-w64-x86_64-zlib ^
               mingw-w64-x86_64-7zip ^

diff --git a/.github/workflows/msvc.yml b/.github/workflows/msvc.yml
@@ -13,14 +13,14 @@ jobs:
     strategy:
       matrix:
         BUILD_TYPE: [Release, Debug]
-        qt_version: [6.6.1, 5.15.2, 5.12.12]
+        qt_version: [6.6.2, 5.15.2, 5.12.12]
         include:
-          - qt_version: 6.6.1
+          - qt_version: 6.6.2
             triplet: x64-windows
             VCPKG_PLATFORM_TOOLSET: v142
             qt_arch: win64_msvc2019_64
             CMAKE_GENERATOR_PLATFORM: x64
-            qt_modules: qtscxml qtwebchannel qtwebsockets qtwebview qtpositioning
+            qt_modules: qtmultimedia qtimageformats qtscxml qtwebchannel qtwebsockets qtwebview qtpositioning
 
           - qt_version: 5.15.2
             triplet: x64-windows
@@ -132,6 +132,7 @@ jobs:
           copy /Y ${{env.INSTALL_DIR}}\lib\*.dll install\bin
           copy /Y ${{env.RUNVCPKG_VCPKG_ROOT}}\installed\${{env.RUNVCPKG_VCPKG_TRIPLET_OUT}}\bin\*.dll install\bin
           makensis Install.nsi
+          RENAME ChineseChessControl_${{env.ChineseChessControl_VERSION}}_Setup.exe ChineseChessControl_${{env.ChineseChessControl_VERSION}}_${{matrix.qt_arch}}_Qt${{matrix.qt_version}}_${{matrix.BUILD_TYPE}}_Setup.exe 
 
       - name: Package develop library
         working-directory: ${{github.workspace}}\build
@@ -140,13 +141,14 @@ jobs:
           cmake --install . --config ${{matrix.BUILD_TYPE}} --prefix=%CD%\install_develop --component=QtDevelopment
           cmake --install . --config ${{matrix.BUILD_TYPE}} --prefix=%CD%\install_develop --component=Development
           7z a ChineseChessControl_${{env.ChineseChessControl_VERSION}}_${{matrix.qt_arch}}_Qt${{matrix.qt_version}}_${{matrix.BUILD_TYPE}}_Develop.zip %CD%\install_develop\.
-          cmake --build . --config ${{ matrix.BUILD_TYPE }} --target package
+          cd install_develop
+          cmake --build ${{github.workspace}}\build --config ${{ matrix.BUILD_TYPE }} --target package
 
       - name: Update artifact
-        if: ${{ matrix.BUILD_TYPE == 'Release' && matrix.update_artifact }}
         uses: actions/upload-artifact@v2
         with:
           name: ${{ env.artifact_name }}
           path: |
-            ${{github.workspace}}\build\chinesechesscontrol_*.exe
+            ${{github.workspace}}\build\ChineseChessControl_*.exe
+            ${{github.workspace}}\build\install_develop\ChineseChessControl_*.exe
             ${{github.workspace}}\build\ChineseChessControl_${{env.ChineseChessControl_VERSION}}_${{matrix.qt_arch}}_Qt${{matrix.qt_version}}_${{matrix.BUILD_TYPE}}_Develop.zip
diff --git a/Install/Install.nsi b/Install/Install.nsi
@@ -70,7 +70,7 @@ LangString LANG_DIRECTORY_PERMISSION ${LANG_SIMPCHINESE} "无目录访问权限"
 
 Name "$(LANG_PRODUCT_NAME) ${PRODUCT_VERSION}"
 Caption "$(LANG_PRODUCT_NAME) ${PRODUCT_VERSION}"
-OutFile "${PRODUCT_NAME}_${PRODUCT_VERSION}_msvc@MSVC_VERSION@_@BUILD_ARCH@_Setup.exe"
+OutFile "${PRODUCT_NAME}_${PRODUCT_VERSION}_Setup.exe"
 InstallDir "$PROGRAMFILES\${PRODUCT_NAME}"
 ;InstallDirRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_DIR_REGKEY}" ""
 

diff --git a/appveyor.yml b/appveyor.yml
@@ -84,7 +84,7 @@ build_script:
   - cmake --build . --config Release --target package
 
 artifacts:
-  - path: build_$(BUILD_TARGERT)\ChineseChessControl*.exe
+  - path: build\chinesechesscontrol*.exe
 
 test: off
 

diff --git a/ci/backgroud_echo.sh b/ci/backgroud_echo.sh
diff --git a/ci/build-install-tools-windows.sh b/ci/build-install-tools-windows.sh