uvos/eismultiplexer-qt
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

CI: fix version handling

Browse source
This commit is contained in:
Carl Philipp Klemm 2025-09-18 13:09:07 +02:00
parent 379342c086
commit c3afad46bc
2 changed files with 27 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
.gitea/workflows/build.yml
View file

@ -18,21 +18,27 @@ jobs:
chmod +x appimagetool-904-x86_64.AppImage chmod +x appimagetool-904-x86_64.AppImage
mv appimagetool-904-x86_64.AppImage /usr/bin/appimagetool mv appimagetool-904-x86_64.AppImage /usr/bin/appimagetool
- name: libeismultiplexer version - name: libeismultiplexer version
id: version id: libeisversion
run: | run: |
cd ${{ gitea.workspace }}/libeismultiplexer cd ${{ gitea.workspace }}/libeismultiplexer
git fetch -a; git fetch -a;
echo "tag=$(git describe --tags `git rev-list --tags --max-count=1`)" >> $GITHUB_OUTPUT echo "tag=$(git describe --tags `git rev-list --tags --max-count=1`)" >> $GITHUB_OUTPUT
- name: Version
id: version
run: |
cd ${{ gitea.workspace }}
git fetch -a;
echo "tag=$(git describe --tags `git rev-list --tags --max-count=1`)" >> $GITHUB_OUTPUT
- name: Build and install libeismultiplexer - name: Build and install libeismultiplexer
run: | run: |
mkdir ${{ gitea.workspace }}/libeismultiplexer/build; cd ${{ gitea.workspace }}/libeismultiplexer/build mkdir ${{ gitea.workspace }}/libeismultiplexer/build; cd ${{ gitea.workspace }}/libeismultiplexer/build
cmake -DCMAKE_BUILD_TYPE=Release -DGIT_TAG=${{ steps.version.outputs.tag }} .. cmake -DCMAKE_BUILD_TYPE=Release -DGIT_TAG=${{ steps.libeisversion.outputs.tag }} ..
make make
make install make install
- name: Build - name: Build
run: | run: |
mkdir ${{ gitea.workspace }}/build; cd ${{ gitea.workspace }}/build mkdir ${{ gitea.workspace }}/build; cd ${{ gitea.workspace }}/build
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=./install/usr .. cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=./install/usr -DGIT_TAG=${{ steps.version.outputs.tag }} ..
make make
make install make install
- name: Create Appimage - name: Create Appimage

36
cmake/GitVersion.cmake
View file

@ -1,25 +1,19 @@
function(get_version_from_git) function(get_version_from_git)
find_package(Git REQUIRED) find_package(Git REQUIRED)
execute_process( if(NOT GIT_TAG)
COMMAND ${GIT_EXECUTABLE} describe --tags --always execute_process(
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} COMMAND ${GIT_EXECUTABLE} describe --tags --always
OUTPUT_VARIABLE GIT_TAG WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE GIT_TAG
RESULT_VARIABLE GIT_RESULT OUTPUT_STRIP_TRAILING_WHITESPACE
) RESULT_VARIABLE GIT_RESULT
)
if(NOT GIT_RESULT EQUAL 0) if(NOT GIT_RESULT EQUAL 0)
message(FATAL_ERROR "Failed to get git tag") message(FATAL_ERROR "Failed to get git tag")
endif()
endif() endif()
execute_process(
COMMAND ${GIT_EXECUTABLE} rev-parse --short=7 HEAD
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
OUTPUT_VARIABLE GIT_COMMIT_SHORT_HASH
OUTPUT_STRIP_TRAILING_WHITESPACE
)
string(REGEX REPLACE "^v" "" CLEAN_TAG "${GIT_TAG}") string(REGEX REPLACE "^v" "" CLEAN_TAG "${GIT_TAG}")
if(CLEAN_TAG MATCHES "^([0-9]+)\\.([0-9]+)\\.([0-9]+)(-.*)?$") if(CLEAN_TAG MATCHES "^([0-9]+)\\.([0-9]+)\\.([0-9]+)(-.*)?$")
@ -33,6 +27,12 @@ function(get_version_from_git)
set(PROJECT_VERSION "${CMAKE_MATCH_1}.${CMAKE_MATCH_2}.${CMAKE_MATCH_3}") set(PROJECT_VERSION "${CMAKE_MATCH_1}.${CMAKE_MATCH_2}.${CMAKE_MATCH_3}")
set(PROJECT_VERSION "${CMAKE_MATCH_1}.${CMAKE_MATCH_2}.${CMAKE_MATCH_3}" PARENT_SCOPE) set(PROJECT_VERSION "${CMAKE_MATCH_1}.${CMAKE_MATCH_2}.${CMAKE_MATCH_3}" PARENT_SCOPE)
else() else()
message(FATAL_ERROR "Tag '${CLEAN_TAG}' does not match semver format") message(WARNING "Tag '${CLEAN_TAG}' does not match semver format")
set(CMAKE_PROJECT_VERSION_MAJOR 0)
set(CMAKE_PROJECT_VERSION_MAJOR 0 PARENT_SCOPE)
set(CMAKE_PROJECT_VERSION_MINOR 0)
set(CMAKE_PROJECT_VERSION_MINOR 0 PARENT_SCOPE)
set(CMAKE_PROJECT_VERSION_PATCH 0)
set(CMAKE_PROJECT_VERSION_PATCH 0 PARENT_SCOPE)
endif() endif()
endfunction() endfunction()