其他更新：Github Action workflow细节优化

KOROyo123 · May 11, 2024 · 8dfc01b · 8dfc01b
1 parent 453971c
commit 8dfc01b
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 22 deletions.
diff --git a/.github/workflows/Ubuntu-GCC.yml b/.github/workflows/Ubuntu-GCC.yml
@@ -42,7 +42,7 @@ jobs:
       uses: actions/upload-artifact@v4.3.3
       with:
         # 上传后文件的名称
-        name: Koro_Caster_Service-${{ steps.tag_version.outputs.tag_version }}-ububtu-latest
+        name: Koro_Caster_Service-${{ steps.tag_version.outputs.tag_version }}-ububtu-gcc
         # 上传文件的路径
         path: ${{github.workspace}}/bin/Koro_Caster_Service/
 
diff --git a/.github/workflows/Windows-MSVC.yml b/.github/workflows/Windows-MSVC.yml
@@ -1,4 +1,4 @@
-name: Windows-MinGW
+name: Windows-MSVC
 
 on:
   push:
@@ -15,27 +15,31 @@ jobs:
     runs-on: windows-latest
 
     steps:
-    - uses: actions/checkout@v4.1.4
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
         fetch-tags: true  # 获取所有的 Git 标签
- 
+
     - name: Configure CMake
       # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
       # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
-      run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -G "MinGW Makefiles"
+      run: >
+        cmake -B ${{github.workspace}}/build
+        -DCMAKE_CXX_COMPILER= cl
+        -DCMAKE_C_COMPILER=cl
+        -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
 
     - name: Build
       # Build your program with the given configuration
       run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
-
+      
     - name: Deploy Compress folder
       run: |
-        copy C:\mingw64\bin\libgcc_s_seh-1.dll ${{github.workspace}}\bin\Koro_Caster_Service\
-        copy C:\mingw64\bin\libstdc++-6.dll ${{github.workspace}}\bin\Koro_Caster_Service\
-        copy C:\mingw64\bin\libwinpthread-1.dll ${{github.workspace}}\bin\Koro_Caster_Service\
+        move ${{github.workspace}}\bin\Koro_Caster_Service\${{env.BUILD_TYPE}}\* ${{github.workspace}}\bin\Koro_Caster_Service\
+        rmdir /s /q ${{github.workspace}}\bin\Koro_Caster_Service\${{env.BUILD_TYPE}}
         xcopy /S /E /I ${{github.workspace}}\env\Redis-7.0.15-Windows-x64\ ${{github.workspace}}\bin\Koro_Caster_Service\env\Redis-7.0.15-Windows-x64\
 
+
     - name: Get tag version
       id: tag_version
       run: echo "::set-output name=tag_version::$(git describe --tags --dirty=-dev)"
@@ -44,6 +48,7 @@ jobs:
       uses: actions/upload-artifact@v4.3.3
       with:
         # 上传后文件的名称
-        name: Koro_Caster_Service-${{ steps.tag_version.outputs.tag_version }}-windows-mingw
+        name: Koro_Caster_Service-${{ steps.tag_version.outputs.tag_version }}-windows-msvc
         # 上传的压缩包
         path: ${{github.workspace}}\bin\Koro_Caster_Service\
+
diff --git a/.github/workflows/Windows-MinGW.yml b/.github/workflows/Windows-MinGW.yml
@@ -1,4 +1,4 @@
-name: Windows-MSVC
+name: Windows-MinGW
 
 on:
   push:
@@ -15,23 +15,27 @@ jobs:
     runs-on: windows-latest
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v4.1.4
       with:
         fetch-depth: 0
         fetch-tags: true  # 获取所有的 Git 标签
-
+ 
     - name: Configure CMake
       # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
       # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
-      run: >
-        cmake -B ${{github.workspace}}/build
-        -DCMAKE_CXX_COMPILER= cl
-        -DCMAKE_C_COMPILER=cl
-        -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
+      run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -G "MinGW Makefiles"
+
     - name: Build
       # Build your program with the given configuration
       run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
-
+
+    - name: Deploy Compress folder
+      run: |
+        copy C:\mingw64\bin\libgcc_s_seh-1.dll ${{github.workspace}}\bin\Koro_Caster_Service\
+        copy C:\mingw64\bin\libstdc++-6.dll ${{github.workspace}}\bin\Koro_Caster_Service\
+        copy C:\mingw64\bin\libwinpthread-1.dll ${{github.workspace}}\bin\Koro_Caster_Service\
+        xcopy /S /E /I ${{github.workspace}}\env\Redis-7.0.15-Windows-x64\ ${{github.workspace}}\bin\Koro_Caster_Service\env\Redis-7.0.15-Windows-x64\
+
     - name: Get tag version
       id: tag_version
       run: echo "::set-output name=tag_version::$(git describe --tags --dirty=-dev)"
@@ -40,7 +44,6 @@ jobs:
       uses: actions/upload-artifact@v4.3.3
       with:
         # 上传后文件的名称
-        name: Koro_Caster_Service-${{ steps.tag_version.outputs.tag_version }}-windows-msvc
+        name: Koro_Caster_Service-${{ steps.tag_version.outputs.tag_version }}-windows-mingw
         # 上传的压缩包
         path: ${{github.workspace}}\bin\Koro_Caster_Service\
-
diff --git a/app/Koro_Caster_Service/CMakeLists.txt b/app/Koro_Caster_Service/CMakeLists.txt
@@ -145,11 +145,11 @@ configure_file(${CMAKE_SOURCE_DIR}/version.h.in version.h @ONLY)
 target_include_directories(${EXE_NAME}  PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
 
 #基于工程目录下的配置文件 生成 执行目录下的配置文件
+set_target_properties(${EXE_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/bin/Koro_Caster_Service")
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/conf/Auth_Verify.yml.in ${CMAKE_SOURCE_DIR}/bin/Koro_Caster_Service/conf/Auth_Verify.yml @ONLY)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/conf/Caster_Core.yml.in ${CMAKE_SOURCE_DIR}/bin/Koro_Caster_Service/conf/Caster_Core.yml @ONLY)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/conf/Service_Setting.yml.in ${CMAKE_SOURCE_DIR}/bin/Koro_Caster_Service/conf/Service_Setting.yml @ONLY)
 
-set_target_properties(${EXE_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/bin/Koro_Caster_Service")
 message(STATUS "BINARY_DIR : ${CMAKE_SOURCE_DIR}/bin/Koro_Caster_Service")
 #Koro_NavTool
 target_link_libraries(${EXE_NAME} knt)