Skip to content

Commit f3e0dfd

Browse files
authored
Merge pull request #4858 from 3d-gussner/MK3_build_tags
Add `t` and `c` build
2 parents 7731024 + 295142a commit f3e0dfd

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

.github/workflows/build.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ on:
88
branches: [ MK3, MK3_* ]
99
tags:
1010
- 'v*'
11+
- 't*'
12+
- 'c*'
1113

1214
env:
1315
GH_ANNOTATIONS: 1
@@ -69,10 +71,11 @@ jobs:
6971
path: build/*.hex
7072

7173
- name: RELEASE THE KRAKEN
72-
if: startsWith(github.ref, 'refs/tags/v')
74+
if: startsWith(github.ref, 'refs/tags/v') || startsWith(github.ref, 'refs/tags/t') || startsWith(github.ref, 'refs/tags/c')
7375
uses: "marvinpinto/action-automatic-releases@latest"
7476
with:
7577
repo_token: "${{ secrets.GITHUB_TOKEN }}"
78+
automatic_release_tag: ${{ github.ref_name }}
7679
draft: true
7780
files: |
7881
${{ github.workspace }}/build/release/*.hex

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ message(STATUS "Filename debug suffix ...........: ${FN_VERSION_DEBUG_SUFFIX}")
5858
# SET(FW_COMMIT_DSC "v3.13.0-1234")
5959

6060
if(NOT "${PROJECT_VERSION_HASH}" STREQUAL "UNKNOWN" AND NOT "${FW_COMMIT_DSC}" MATCHES ".+NOTFOUND.+") # else -> no commit hash is known... likely no git.
61-
string(REGEX MATCH "[v|t]([0-9]+)\.([0-9]+)\.([0-9]+)-?(${DEV_TAG_REGEX})?([0-9]+)?-([0-9]+)" TAG_VERSION "${FW_COMMIT_DSC}")
61+
string(REGEX MATCH "[v|t|c]([0-9]+)\.([0-9]+)\.([0-9]+)-?(${DEV_TAG_REGEX})?([0-9]+)?-([0-9]+)" TAG_VERSION "${FW_COMMIT_DSC}")
6262

6363
if (CMAKE_MATCH_4) # Do we have a build type?
6464
decode_flavor_code(PROJECT_VER_TAG_FLV "${CMAKE_MATCH_4}" "${CMAKE_MATCH_5}")

0 commit comments

Comments
 (0)