Skip to content

Commit ba8cc38

Browse files
KangLinKangLin
committed
CI: modify CI
1 parent edc93fc commit ba8cc38

File tree

4 files changed

+36
-17
lines changed

4 files changed

+36
-17
lines changed

‎.github/workflows/msvc.yml‎

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -159,12 +159,27 @@ jobs:
159159
if: ${{ matrix.BUILD_TYPE == 'Release' }}
160160
working-directory: ${{github.workspace}}\build
161161
run: |
162-
cmake --build . --config ${{ matrix.BUILD_TYPE }} --target package
162+
cmake --install . --config ${{matrix.BUILD_TYPE}} --component=MFCApplications
163+
cmake --install . --config ${{matrix.BUILD_TYPE}} --component=MFCRuntime
164+
cmake --install . --config ${{matrix.BUILD_TYPE}} --component=QtApplications
165+
cmake --install . --config ${{matrix.BUILD_TYPE}} --component=QtRuntime
166+
cmake --install . --config ${{matrix.BUILD_TYPE}} --component=Runtime
167+
cmake --install . --config ${{matrix.BUILD_TYPE}} --component=DependLibraries
168+
copy /Y ${{env.INSTALL_DIR}}\bin\*.dll install\bin
169+
copy /Y ${{env.INSTALL_DIR}}\lib\*.dll install\bin
170+
copy /Y ${{env.RUNVCPKG_VCPKG_ROOT}}\installed\${{env.RUNVCPKG_VCPKG_TRIPLET_OUT}}\bin\*.dll install\bin
171+
makensis Install.nsi
172+
cmake --install . --config ${{matrix.BUILD_TYPE}} --prefix=%CD%\install_develop --component=MFCDevelopment
173+
cmake --install . --config ${{matrix.BUILD_TYPE}} --prefix=%CD%\install_develop --component=QtDevelopment
174+
cmake --install . --config ${{matrix.BUILD_TYPE}} --prefix=%CD%\install_develop --component=Development
175+
7z a ChineseChessControl_${{env.ChineseChessControl_VERSION}}_${{matrix.qt_arch}}_Qt${{matrix.qt_version}}_Develop.zip %CD%\install_develop\.
176+
# cmake --build . --config ${{ matrix.BUILD_TYPE }} --target package
163177

164178
- name: Update artifact
165-
if: ${{ matrix.BUILD_TYPE == 'Release' && matrix.qt_version == '5.12.12' }}
179+
if: ${{ matrix.BUILD_TYPE == 'Release' && matrix.qt_version != '5.15.2' }}
166180
uses: actions/upload-artifact@v2
167181
with:
168182
name: ${{ env.artifact_name }}
169183
path: |
170-
${{github.workspace}}\build\chinesechesscontrol_*_setup.exe
184+
${{github.workspace}}\build\chinesechesscontrol_*.exe
185+
${{github.workspace}}\build\ChineseChessControl_${{env.ChineseChessControl_VERSION}}_${{matrix.qt_arch}}_Qt${{matrix.qt_version}}_Develop.zip

‎Install/Install.nsi‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ LangString LANG_DIRECTORY_PERMISSION ${LANG_SIMPCHINESE} "无目录访问权限"
7070

7171
Name "$(LANG_PRODUCT_NAME) ${PRODUCT_VERSION}"
7272
Caption "$(LANG_PRODUCT_NAME) ${PRODUCT_VERSION}"
73-
OutFile "${PRODUCT_NAME}_Setup_msvc@MSVC_VERSION@_@BUILD_ARCH@_${PRODUCT_VERSION}.exe"
73+
OutFile "${PRODUCT_NAME}_${PRODUCT_VERSION}_msvc@MSVC_VERSION@_@BUILD_ARCH@_Setup.exe"
7474
InstallDir "$PROGRAMFILES\${PRODUCT_NAME}"
7575
;InstallDirRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_DIR_REGKEY}" ""
7676

@@ -99,12 +99,12 @@ Function InstallVC64
9999
Push $R0
100100
ClearErrors
101101
ReadRegDword $R0 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{FF66E9F6-83E7-3A3E-AF14-8DE9A809A6A4}" "Version"
102-
102+
103103
; check register
104104
IfErrors 0 VSRedistInstalled
105105
Exec "$INSTDIR\bin\vcredist_x64.exe /q /norestart"
106106
StrCpy $R0 "-1"
107-
107+
108108
VSRedistInstalled:
109109
;MessageBox MB_OK "Vcredist_x64.exe is installed"
110110
Exch $R0
@@ -152,7 +152,7 @@ Section "${PRODUCT_NAME}" SEC01
152152
SetOverwrite ifnewer
153153
File /r "install\*"
154154
;SetShellVarContext all
155-
155+
156156
;SetShellVarContext current
157157
call InstallRuntime
158158
SectionEnd

‎README.md‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,14 @@
6868
#### [下载安装包](https://github.com/KangLin/ChineseChessControl/releases/latest)
6969
+ [最后版本](https://github.com/KangLin/ChineseChessControl/releases/latest)
7070
+ 当前版本：
71-
- Windows
72-
- [chinesechesscontrol_v2.0.8_Windows_X86_setup.exe](https://github.com/KangLin/ChineseChessControl/releases/download/v2.0.8/chinesechesscontrol_v2.0.8_Windows_X86_setup.exe)
71+
- Windows安装包，支持 Windows 7 以上系统。
72+
- [ChineseChessControl_v2.0.8_msvc1929_x86_64_Setup.exe](https://github.com/KangLin/ChineseChessControl/releases/download/v2.0.8/ChineseChessControl_v2.0.8_msvc1929_x86_64_Setup.exe)
73+
- [ChineseChessControl_v2.0.7_msvc1916_x86_Setup.exe](https://github.com/KangLin/ChineseChessControl/releases/download/v2.0.8/ChineseChessControl_v2.0.8_msvc1929_x86_Setup.exe)
7374

74-
Windows安装包，支持 Windows 7 以上系统。安装完成后，使用请详见：[开发者文档](Documents/Developer.md#调试)
75+
- Windows开发包，安装完成后，使用请详见：[开发者文档](Documents/Developer.md#调试)
76+
77+
- [ChineseChessControl_v2.0.8_win32_msvc2017_qt6.12.12_Develop.zip](https://github.com/KangLin/ChineseChessControl/releases/download/v2.0.8/ChineseChessControl_v2.0.8_win32_msvc2017_qt6.12.12_Develop.zip)
78+
- [ChineseChessControl_v2.0.8_win64_msvc2019_64_qt6.5.1_Develop.zip](https://github.com/KangLin/ChineseChessControl/releases/download/v2.0.8/ChineseChessControl_v2.0.8_win64_msvc2019_64_qt6.5.1_Develop.zip)
7579

7680
- linux
7781
- [chinesechesscontrol_v2.0.8_Linux_x86_64_setup.sh](https://github.com/KangLin/ChineseChessControl/releases/download/v2.0.8/chinesechesscontrol_v2.0.8_Linux_x86_64_setup.sh)
@@ -84,13 +88,13 @@
8488

8589
- Android
8690
- APK
87-
- [ChineseChessControl_v2.0.8_android_arm64_v8a_qt2.0.8_Release.apk](https://github.com/KangLin/ChineseChessControl/releases/download/v2.0.8/ChineseChessControl_v2.0.8_android_arm64_v8a_qt2.0.8_Release.apk)
88-
- [ChineseChessControl_v2.0.8_android_armv7_qt2.0.8_Release.apk](https://github.com/KangLin/ChineseChessControl/releases/download/v2.0.8/ChineseChessControl_v2.0.8_android_armv7_qt2.0.8_Release.apk)
89-
- [ChineseChessControl_v2.0.8_android_x86_64_qt2.0.8_Release.apk](https://github.com/KangLin/ChineseChessControl/releases/download/v2.0.8/ChineseChessControl_v2.0.8_android_x86_64_qt2.0.8_Release.apk)
91+
- [ChineseChessControl_v2.0.8_android_arm64_v8a_qt6.5.1_Release.apk](https://github.com/KangLin/ChineseChessControl/releases/download/v2.0.8/ChineseChessControl_v2.0.8_android_arm64_v8a_qt6.5.1_Release.apk)
92+
- [ChineseChessControl_v2.0.8_android_armv7_qt6.5.1_Release.apk](https://github.com/KangLin/ChineseChessControl/releases/download/v2.0.8/ChineseChessControl_v2.0.8_android_armv7_qt6.5.1_Release.apk)
93+
- [ChineseChessControl_v2.0.8_android_x86_64_qt6.5.1_Release.apk](https://github.com/KangLin/ChineseChessControl/releases/download/v2.0.8/ChineseChessControl_v2.0.8_android_x86_64_qt6.5.1_Release.apk)
9094
- 开发包
91-
- [ChineseChessControl_v2.0.8_android_arm64_v8a_qt2.0.8_Release.zip](https://github.com/KangLin/ChineseChessControl/releases/download/v2.0.8/ChineseChessControl_v2.0.8_android_arm64_v8a_qt2.0.8_Release.zip)
92-
- [ChineseChessControl_v2.0.8_android_armv7_qt2.0.8_Release.zip](https://github.com/KangLin/ChineseChessControl/releases/download/v2.0.8/ChineseChessControl_v2.0.8_android_armv7_qt2.0.8_Release.zip)
93-
- [ChineseChessControl_v2.0.8_android_x86_64_qt2.0.8_Release.zip](https://github.com/KangLin/ChineseChessControl/releases/download/v2.0.8/ChineseChessControl_v2.0.8_android_x86_64_qt2.0.8_Release.zip)
95+
- [ChineseChessControl_v2.0.8_android_arm64_v8a_qt6.5.1_Release.zip](https://github.com/KangLin/ChineseChessControl/releases/download/v2.0.8/ChineseChessControl_v2.0.8_android_arm64_v8a_qt6.5.1_Release.zip)
96+
- [ChineseChessControl_v2.0.8_android_armv7_qt6.5.1_Release.zip](https://github.com/KangLin/ChineseChessControl/releases/download/v2.0.8/ChineseChessControl_v2.0.8_android_armv7_qt6.5.1_Release.zip)
97+
- [ChineseChessControl_v2.0.8_android_x86_64_qt6.5.1_Release.zip](https://github.com/KangLin/ChineseChessControl/releases/download/v2.0.8/ChineseChessControl_v2.0.8_android_x86_64_qt6.5.1_Release.zip)
9498

9599
+ [文档](https://github.com/KangLin/ChineseChessControl/releases/download/v2.0.8/ChineseChessControl_v2.0.8_document.zip)
96100
+ [在线文档](https://kanglin.github.io/ChineseChessControl/html/index.html)

‎deploy.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ DEBIAN_VERSION=`echo ${VERSION}|cut -d "v" -f 2`
4747
sed -i "s/export DEBIAN_VERSION=.*/export DEBIAN_VERSION=\"${DEBIAN_VERSION}\"/g" ${SOURCE_DIR}/ci/build.sh
4848
sed -i "s/chinesechess (.*)/chinesechess (${DEBIAN_VERSION})/g" ${SOURCE_DIR}/debian/changelog
4949
sed -i "s/Version=.*/Version=${DEBIAN_VERSION}/g" ${SOURCE_DIR}/Package/share/applications/org.Rabbit.ChineseChess.desktop
50-
sed -i "s/[0-9]\+\.[0-9]\+\.[0-9]\+/${DEBIAN_VERSION}/g" ${SOURCE_DIR}/README*.md
50+
#sed -i "s/[0-9]\+\.[0-9]\+\.[0-9]\+/${DEBIAN_VERSION}/g" ${SOURCE_DIR}/README*.md
5151
sed -i "s/[0-9]\+\.[0-9]\+\.[0-9]\+/${DEBIAN_VERSION}/g" ${SOURCE_DIR}/App/Qt/ChineseChess/android/AndroidManifest.xml
5252
sed -i "s/ChineseChessControl_VERSION:.*/ChineseChessControl_VERSION: \"${DEBIAN_VERSION}\"/g" ${SOURCE_DIR}/.github/workflows/macos.yml
5353
sed -i "s/ChineseChessControl_VERSION:.*/ChineseChessControl_VERSION: \"${DEBIAN_VERSION}\"/g" ${SOURCE_DIR}/.github/workflows/ubuntu.yml

0 commit comments

Comments
 (0)