Change git version to version tag instead of dev tag.

RfidResearchGroup · Oct 21, 2023 · 9c446e5 · 9c446e5
1 parent 74f4eb8
commit 9c446e5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@ All notable changes to this project will be documented in this file.
 This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log...
 
 ## [unreleased][unreleased]
+ - Change git version to version tag instead of dev tag.
  - Fixed 14A emulate bug and MF1 emulate bug (@spp2000 and @xianglin1998)
  - Fixed `hf 14a raw` command raising `AttributeError` (@augustozanellato)
  - Fixed ATS handling in tags that NAK RATS (@augustozanellato)

diff --git a/firmware/Makefile.defs b/firmware/Makefile.defs
@@ -26,7 +26,7 @@ CHAMELEON_LITE  := lite
 CURRENT_DEVICE_TYPE ?= ${CHAMELEON_ULTRA}
 
 # Versioning information
-GIT_VERSION := $(shell git describe --abbrev=7 --dirty --always --tags)
+GIT_VERSION := $(shell git describe --abbrev=7 --dirty --always --tags --match "v*.*")
 APP_FW_SEMVER := $(subst v,,$(shell git describe --tags --abbrev=0 --match "v*.*"))
 APP_FW_VER_MAJOR := $(word 1,$(subst ., ,$(APP_FW_SEMVER)))
 APP_FW_VER_MINOR := $(word 2,$(subst ., ,$(APP_FW_SEMVER)))