From e71ec5c925103c4f6c411dc0b79a6157022d0b20 Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Mon, 3 Oct 2022 11:16:03 +0300 Subject: [PATCH] 1.99.64 --- .gitlab-ci.yml | 13 ------------- MyxCMakeConfigVersion.cmake | 2 +- README.md | 11 ++++------- VERSION | 2 +- create_release.sh | 2 ++ 5 files changed, 8 insertions(+), 22 deletions(-) delete mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index f0592f6..0000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,13 +0,0 @@ -stages: - - release - -release_job: - stage: release - image: registry.gitlab.com/gitlab-org/release-cli:latest - rules: - - if: $CI_COMMIT_TAG - script: - - tar acf myx-cmake-${CI_COMMIT_TAG}.tar.xz lib backports *.cmake - release: - tag_name: '$CI_COMMIT_TAG' - description: '$CI_COMMIT_TAG' diff --git a/MyxCMakeConfigVersion.cmake b/MyxCMakeConfigVersion.cmake index 9e4bf75..49f1e67 100644 --- a/MyxCMakeConfigVersion.cmake +++ b/MyxCMakeConfigVersion.cmake @@ -1,4 +1,4 @@ -set(MYX_CMAKE_PACKAGE_VERSION "1.99.63") +set(MYX_CMAKE_PACKAGE_VERSION "1.99.64") if(MYX_CMAKE_PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION) set(PACKAGE_VERSION_COMPATIBLE FALSE) else() diff --git a/README.md b/README.md index 1e0f910..a39e7de 100644 --- a/README.md +++ b/README.md @@ -7,8 +7,8 @@ ## Использование -В основном файле `CMakeLists.txt` проекта после команды -`project` добавить строки: +В основном файле `CMakeLists.txt` проекта после вызова команды +`project()` добавить строки: ```cmake # Рекомендуемый способ подключения MyxCMake @@ -36,15 +36,12 @@ if(MYX_CMAKE_DIR) set(ENV{MYX_CMAKE_DIR} ${MYX_CMAKE_DIR}) endif() if(DEFINED ENV{MYX_CMAKE_DIR}) - find_package(MyxCMake 1.99.63 REQUIRED) - myx_message_notice("=== MyxCMake directory: ${MyxCMake_CONFIG} ===") + find_package(MyxCMake 1.99.64 REQUIRED) else() if(MYX_CMAKE_USE_SYSTEM) - find_package(MyxCMake 1.99.63 REQUIRED) - myx_message_notice("=== MyxCMake directory: ${MyxCMake_CONFIG} ===") + find_package(MyxCMake 1.99.64 REQUIRED) else() include(${PROJECT_SOURCE_DIR}/cmake/myx/MyxCMakeConfig.cmake) - myx_message_notice("=== MyxCMake directory: ${PROJECT_SOURCE_DIR}/cmake/myx ===") endif() endif() ``` diff --git a/VERSION b/VERSION index 1519713..c2e1b86 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.99.63 +1.99.64 diff --git a/create_release.sh b/create_release.sh index ad20096..71aefb1 100755 --- a/create_release.sh +++ b/create_release.sh @@ -28,4 +28,6 @@ tar acf "$D/myx-cmake-$V.tar.xz" lib backports *.cmake git commit -a git tag $V git push --tags +git tag -d $V +git push --all tea r c -t $V --tag $V -a build/myx-cmake-$V.tar.xz