File tree Expand file tree Collapse file tree 3 files changed +9
-4
lines changed Expand file tree Collapse file tree 3 files changed +9
-4
lines changed Original file line number Diff line number Diff line change @@ -6,7 +6,6 @@ BUILD_DATE=$(date +"%a %b %d %Y")
6
6
VERSION_NUMBER=$( grep " project.*" CMakeLists.txt | egrep -o " ${VERSION_REGEX} " )
7
7
WORKSPACE=" $GITHUB_WORKSPACE "
8
8
INSTALL_PREFIX=" $WORKSPACE /tmp"
9
- BUILD_TYPE=" $MATRIX_BUILD_TYPE "
10
9
11
10
echo " BUILD_TYPE=$BUILD_TYPE " >> $GITHUB_ENV
12
11
echo " BUILD_TIME=$BUILD_TIME " >> $GITHUB_ENV
@@ -35,11 +34,11 @@ if [[ -z "${GITHUB_TAG}" ]]; then
35
34
echo " Build is not tagged this is a continuous build"
36
35
VERSION_SUFFIX=" continuous"
37
36
echo " VERSION_SUFFIX=$VERSION_SUFFIX " >> $GITHUB_ENV
38
- echo " VERSION=${VERSION_NUMBER} -${VERSION_SUFFIX} " >> $GITHUB_ENV
37
+ echo " VERSION=${VERSION_NUMBER} -${$BUILD_TYPE } - ${ VERSION_SUFFIX}" >> $GITHUB_ENV
39
38
else
40
39
echo " Build is tagged this is not a continues build"
41
40
echo " Building ksnip-plugin-ocr version ${VERSION_NUMBER} "
42
- echo " VERSION=${VERSION_NUMBER} " >> $GITHUB_ENV
41
+ echo " VERSION=${VERSION_NUMBER} - ${ $BUILD_TYPE } " >> $GITHUB_ENV
43
42
fi
44
43
45
44
Original file line number Diff line number Diff line change @@ -11,12 +11,14 @@ jobs:
11
11
runs-on : ubuntu-latest
12
12
strategy :
13
13
matrix :
14
- build_type : [ debug, release ]
14
+ build-type : [ debug, release ]
15
15
steps :
16
16
- name : Checkout
17
17
uses : actions/checkout@v2
18
18
19
19
- name : Set up build variables
20
+ env :
21
+ BUILD_TYPE : ${{ matrix.build-type }}
20
22
run : bash ./.github/scripts/setup_build_variables.sh
21
23
22
24
- name : Install Qt
55
57
uses : actions/checkout@v2
56
58
57
59
- name : Set up build variables
60
+ env :
61
+ BUILD_TYPE : ${{ matrix.build-type }}
58
62
run : bash ./.github/scripts/setup_build_variables.sh
59
63
60
64
- name : Install Qt
Original file line number Diff line number Diff line change 17
17
uses : actions/checkout@v2
18
18
19
19
- name : Set up build variables
20
+ env :
21
+ BUILD_TYPE : ${{ matrix.build-type }}
20
22
run : bash ./.github/scripts/setup_build_variables.sh
21
23
22
24
- name : Install Qt
You can’t perform that action at this time.
0 commit comments