diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 924e749..bc36bd2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -33,7 +33,7 @@ variables: # 关于预构建包 - Windows XP系统请使用`Windows-GNU`版本。 + Windows XP系统请使用Windows-GNU-x86版本。 # Windows运行器配置 .win-template: &win @@ -65,8 +65,8 @@ build-xp: - cpack artifacts: paths: - - build-xp/frelay-release-v$PROJECT_VERSION-Windows-GNU.exe - - build-xp/frelay-release-v$PROJECT_VERSION-Windows-GNU.zip + - build-xp/frelay-release-v$PROJECT_VERSION-Windows-GNU-x86.exe + - build-xp/frelay-release-v$PROJECT_VERSION-Windows-GNU-x86.zip build-windows: <<: *win @@ -83,8 +83,8 @@ build-windows: - cpack artifacts: paths: - - build/frelay-release-v$PROJECT_VERSION-Windows-MSVC.exe - - build/frelay-release-v$PROJECT_VERSION-Windows-MSVC.zip + - build/frelay-release-v$PROJECT_VERSION-Windows-MSVC-x64.exe + - build/frelay-release-v$PROJECT_VERSION-Windows-MSVC-x64.zip create-release: stage: release @@ -101,20 +101,20 @@ create-release: - echo "start release" - > curl --fail --show-error --header "JOB-TOKEN: $CI_JOB_TOKEN" \ - --upload-file "build/frelay-release-v$PROJECT_VERSION-Windows-MSVC.exe" \ - "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/releases/v$PROJECT_VERSION/frelay-release-v$PROJECT_VERSION-Windows-MSVC.exe" + --upload-file "build/frelay-release-v$PROJECT_VERSION-Windows-MSVC-x64.exe" \ + "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/releases/v$PROJECT_VERSION/frelay-release-v$PROJECT_VERSION-Windows-MSVC-x64.exe" - > curl --fail --show-error --header "JOB-TOKEN: $CI_JOB_TOKEN" \ - --upload-file "build/frelay-release-v$PROJECT_VERSION-Windows-MSVC.zip" \ - "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/releases/v$PROJECT_VERSION/frelay-release-v$PROJECT_VERSION-Windows-MSVC.zip" + --upload-file "build/frelay-release-v$PROJECT_VERSION-Windows-MSVC-x64.zip" \ + "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/releases/v$PROJECT_VERSION/frelay-release-v$PROJECT_VERSION-Windows-MSVC-x64.zip" - > curl --fail --show-error --header "JOB-TOKEN: $CI_JOB_TOKEN" \ - --upload-file "build-xp/frelay-release-v$PROJECT_VERSION-Windows-GNU.exe" \ - "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/releases/v$PROJECT_VERSION/frelay-release-v$PROJECT_VERSION-Windows-GNU.exe" + --upload-file "build-xp/frelay-release-v$PROJECT_VERSION-Windows-GNU-x86.exe" \ + "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/releases/v$PROJECT_VERSION/frelay-release-v$PROJECT_VERSION-Windows-GNU-x86.exe" - > curl --fail --show-error --header "JOB-TOKEN: $CI_JOB_TOKEN" \ - --upload-file "build-xp/frelay-release-v$PROJECT_VERSION-Windows-GNU.zip" \ - "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/releases/v$PROJECT_VERSION/frelay-release-v$PROJECT_VERSION-Windows-GNU.zip" + --upload-file "build-xp/frelay-release-v$PROJECT_VERSION-Windows-GNU-x86.zip" \ + "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/releases/v$PROJECT_VERSION/frelay-release-v$PROJECT_VERSION-Windows-GNU-x86.zip" release: tag_name: $RELEASE_TAG @@ -122,11 +122,11 @@ create-release: description: $RELEASE_DESCRIPTION assets: links: - - name: "frelay-release-v$PROJECT_VERSION-Windows-MSVC.exe" - url: "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/releases/v$PROJECT_VERSION/frelay-release-v$PROJECT_VERSION-Windows-MSVC.exe" - - name: "frelay-release-v$PROJECT_VERSION-Windows-MSVC.zip" - url: "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/releases/v$PROJECT_VERSION/frelay-release-v$PROJECT_VERSION-Windows-MSVC.zip" - - name: "frelay-release-v$PROJECT_VERSION-Windows-GNU.exe" - url: "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/releases/v$PROJECT_VERSION/frelay-release-v$PROJECT_VERSION-Windows-GNU.exe" - - name: "frelay-release-v$PROJECT_VERSION-Windows-GNU.zip" - url: "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/releases/v$PROJECT_VERSION/frelay-release-v$PROJECT_VERSION-Windows-GNU.zip" \ No newline at end of file + - name: "frelay-release-v$PROJECT_VERSION-Windows-MSVC-x64.exe" + url: "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/releases/v$PROJECT_VERSION/frelay-release-v$PROJECT_VERSION-Windows-MSVC-x64.exe" + - name: "frelay-release-v$PROJECT_VERSION-Windows-MSVC-x64.zip" + url: "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/releases/v$PROJECT_VERSION/frelay-release-v$PROJECT_VERSION-Windows-MSVC-x64.zip" + - name: "frelay-release-v$PROJECT_VERSION-Windows-GNU-x86.exe" + url: "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/releases/v$PROJECT_VERSION/frelay-release-v$PROJECT_VERSION-Windows-GNU-x86.exe" + - name: "frelay-release-v$PROJECT_VERSION-Windows-GNU-x86.zip" + url: "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/releases/v$PROJECT_VERSION/frelay-release-v$PROJECT_VERSION-Windows-GNU-x86.zip" \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index feea44d..4ae50af 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -169,5 +169,12 @@ set(CPACK_NSIS_DELETE_ICONS_EXTRA " else() set(CPACK_GENERATOR "TGZ") endif() -set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${DEVELOP_MARK}-v${CPACK_PACKAGE_VERSION}-${CMAKE_SYSTEM_NAME}-${CMAKE_CXX_COMPILER_ID}") +if(CMAKE_SIZEOF_VOID_P EQUAL 8) + set(ARCH_BIT "x64") +elseif(CMAKE_SIZEOF_VOID_P EQUAL 4) + set(ARCH_BIT "x86") +else() + message(FATAL_ERROR "Unknown target architecture") +endif() +set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${DEVELOP_MARK}-v${CPACK_PACKAGE_VERSION}-${CMAKE_SYSTEM_NAME}-${CMAKE_CXX_COMPILER_ID}-${ARCH_BIT}") include(CPack)