e fix dirty version tag handling

... also removed daily builds
TUW-GEO · Aug 29, 2023 · 9d71bcd · 9d71bcd
1 parent 2f2e096
commit 9d71bcd
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -3,8 +3,6 @@ name: ubuntu
 on:
   push:
   pull_request:
-  schedule:
-    - cron: '0 0 * * *' # daily
 
 jobs:
   build:

diff --git a/Makefile b/Makefile
@@ -55,7 +55,8 @@ test:
 	pytest -rsx --verbose --color=yes --cov=equi7grid --cov-report term-missing
 
 version:
-	echo -e "__version__ = \"$(shell git describe --always --tags --abbrev=0)\"\n__commit__ = \"$(shell git rev-parse --short HEAD)\"" > src/equi7grid/_version.py
+	@version=$(shell git describe --always --tags | awk -F'[-]' '{if (NF == 1) print $$1; else printf "%s.dev%s+g%s\n", $$1, $$2, substr($$3, 2)}')
+	echo -e "__version__ = \"$$version\"\n__commit__ = \"$(shell git rev-parse --short HEAD)\"" > src/equi7grid/_version.py
 
 dist: version
 	pip3 install build twine

diff --git a/src/equi7grid/_version.py b/src/equi7grid/_version.py
@@ -1,2 +1,2 @@
-__version__ = "v0.2.3"
-__commit__ = "5a03a9e"
+__version__ = "0.2.4.dev0+g2f2e096"
+__commit__ = "2f2e096"
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,8 +3,6 @@ name: ubuntu @@
     on:
       push:
       pull_request:
-      schedule:
-        - cron: '0 0 * * *' # daily
     jobs:
       build:
@@ Expand Down @@