File tree 2 files changed +19
-7
lines changed
2 files changed +19
-7
lines changed Original file line number Diff line number Diff line change 12
12
runs-on : ubuntu-22.04
13
13
steps :
14
14
- uses : actions/checkout@v4
15
+ - name : Check version bump
16
+ run : |
17
+ TAG=$(git describe --tags --match "[0-9]*.[0-9]*.[0-9]*" --abbrev=8)
18
+ VERSION=$(grep project CMakeLists.txt| awk '{print $3}')
19
+ if [ "$TAG" != "$VERSION" ]; then
20
+ echo "=== Version in CMakeLists.txt and git tag does not match!"
21
+ echo "=== Git Tag: $TAG, Version: $VERSION"
22
+ exit 1
23
+ fi
15
24
- uses : actions/download-artifact@v4
16
25
- run : |
17
26
mkdir build
Original file line number Diff line number Diff line change @@ -2,15 +2,18 @@ cmake_minimum_required(VERSION 3.12.0)
2
2
3
3
list (APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR} /cmake" )
4
4
5
- include (GetGitVersion)
5
+ project (ttyd VERSION 1.7.6 LANGUAGES C)
6
+
7
+ set (TTYD_VERSION "${PROJECT_VERSION} " )
6
8
9
+ include (GetGitVersion)
7
10
get_git_version(GIT_VERSION SEM_VER)
8
11
get_git_head(GIT_COMMIT)
9
-
10
- project (ttyd VERSION "${SEM_VER} " LANGUAGES C )
11
-
12
- if (NOT "{GIT_COMMIT}" STREQUAL "" )
13
- set (PROJECT_VERSION "${PROJECT_VERSION } -${GIT_COMMIT} " )
12
+ if ( " ${SEM_VER} " VERSION_GREATER " ${TTYD_VERSION} " )
13
+ set (TTYD_VERSION "${SEM_VER} " )
14
+ endif ()
15
+ if (NOT "$ {GIT_COMMIT} " STREQUAL "" )
16
+ set (TTYD_VERSION "${TTYD_VERSION } -${GIT_COMMIT} " )
14
17
endif ()
15
18
16
19
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_GNU_SOURCE" )
@@ -81,7 +84,7 @@ add_executable(${PROJECT_NAME} ${SOURCE_FILES})
81
84
target_include_directories (${PROJECT_NAME} PUBLIC ${INCLUDE_DIRS} )
82
85
target_link_libraries (${PROJECT_NAME} ${LINK_LIBS} )
83
86
target_compile_definitions (${PROJECT_NAME} PUBLIC
84
- TTYD_VERSION="${PROJECT_VERSION } "
87
+ TTYD_VERSION="${TTYD_VERSION } "
85
88
$<$<PLATFORM_ID:Windows>:_WIN32_WINNT=0xa00 WINVER=0xa00>
86
89
)
87
90
You can’t perform that action at this time.
0 commit comments