diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f8bc7603b211d1b7cb1a975a0830151972ee7ddd..0e71457c5334d5c29f877c0f2af6fc8968d94df1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -122,10 +122,12 @@ linux:pack: - docker dependencies: ["linux:build"] + needs: ["linux:test", "linux:valgrind"] script: - DEBIAN_FRONTEND=noninteractive apt update && apt install -y libmsgpackc2 liburiparser1 cmake file - cd build - cpack + - 'curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file "../libftl-protocol-${CI_COMMIT_TAG}-Linux.deb" "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/libftl-protocol/${CI_COMMIT_TAG}/libftl-protocol${CI_COMMIT_TAG}-Linux.deb"' artifacts: when: always @@ -194,6 +196,7 @@ windows:pack: tags: - windows dependencies: ["windows:build"] + needs: ["windows:test"] cache: # use artifacts instead if multiple runners available key: $CI_COMMIT_SHORT_SHA @@ -204,6 +207,7 @@ windows:pack: - $env:PATH+=";C:/Shared/Deploy" - cd build - cpack + - Invoke-RestMethod -Headers @{ "JOB-TOKEN"="$CI_JOB_TOKEN" } -InFile "../libftl-protocol-${CI_COMMIT_TAG}-win64.zip" -uri "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/libftl-protocol/${CI_COMMIT_TAG}/libftl-protocol-${CI_COMMIT_TAG}-win64.zip" -Method put artifacts: when: always diff --git a/cmake/ftl_CPack.cmake b/cmake/ftl_CPack.cmake index e340a2662182441dee91710ee8d5351668185019..b52304a0d165f0b6c2be3adb4e9c1627f7cd8022 100644 --- a/cmake/ftl_CPack.cmake +++ b/cmake/ftl_CPack.cmake @@ -1,6 +1,6 @@ # use build date as patch version -string(TIMESTAMP BUILD_TIME "%Y%m%d") -set(CPACK_PACKAGE_VERSION_PATCH "${BUILD_TIME}") +#string(TIMESTAMP BUILD_TIME "%Y%m%d") +#set(CPACK_PACKAGE_VERSION_PATCH "${BUILD_TIME}") set(CPACK_PACKAGE_NAME "libftl-protocol") set(CPACK_PACKAGE_DIRECTORY "${CMAKE_SOURCE_DIR}") set(CPACK_DEBIAN_PACKAGE_NAME "FTL Protocol Library")