File tree Expand file tree Collapse file tree 2 files changed +20
-11
lines changed Expand file tree Collapse file tree 2 files changed +20
-11
lines changed Original file line number Diff line number Diff line change 73
73
wget -q "https://github.com/coelckers/gzdoom/releases/download/ci_deps/${ZMUSIC_PACKAGE}"
74
74
tar -xf "${ZMUSIC_PACKAGE}"
75
75
fi
76
-
76
+
77
+ - name : Git describe
78
+ id : ghd
79
+ uses : proudust/gh-describe@v2
80
+
77
81
- name : Configure
78
82
shell : bash
79
83
run : |
82
86
- name : Build
83
87
shell : bash
84
88
run : |
89
+ export GIT_DESCRIBE="${{ steps.ghd.outputs.describe }}"
85
90
export MAKEFLAGS=--keep-going
86
91
cmake --build build --config ${{ matrix.config.build_type }} --parallel 3
87
92
Original file line number Diff line number Diff line change @@ -15,16 +15,20 @@ endmacro()
15
15
# Populate variables "Hash", "Tag", and "Timestamp" with relevant information
16
16
# from source repository. If anything goes wrong return something in "Error."
17
17
function (query_repo_info )
18
- execute_process (
19
- COMMAND git describe --tags --dirty=-m
20
- RESULT_VARIABLE Error
21
- OUTPUT_VARIABLE Tag
22
- ERROR_QUIET
23
- OUTPUT_STRIP_TRAILING_WHITESPACE
24
- )
25
- if (NOT "${Error} " STREQUAL "0" )
26
- ret_var (Error )
27
- return ()
18
+ if (DEFINED ENV{GIT_DESCRIBE} )
19
+ set (Tag "$ENV{GIT_DESCRIBE} " )
20
+ else ()
21
+ execute_process (
22
+ COMMAND git describe --tags --dirty=-m
23
+ RESULT_VARIABLE Error
24
+ OUTPUT_VARIABLE Tag
25
+ ERROR_QUIET
26
+ OUTPUT_STRIP_TRAILING_WHITESPACE
27
+ )
28
+ if (NOT "${Error} " STREQUAL "0" )
29
+ ret_var (Error )
30
+ return ()
31
+ endif ()
28
32
endif ()
29
33
30
34
execute_process (
You can’t perform that action at this time.
0 commit comments