From 1a1d694001d6d5941969fd27351190e65afefa73 Mon Sep 17 00:00:00 2001
From: Jim Nicholson <thejimnicholson@gmail.com>
Date: Thu, 1 Feb 2024 22:20:31 -0800
Subject: [PATCH] Refactor tag logic to its own helper

---
 vars/checkoutStep.groovy  | 13 +------------
 vars/getCurrentTag.groovy | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 12 deletions(-)
 create mode 100644 vars/getCurrentTag.groovy

diff --git a/vars/checkoutStep.groovy b/vars/checkoutStep.groovy
index e991991..88d620d 100644
--- a/vars/checkoutStep.groovy
+++ b/vars/checkoutStep.groovy
@@ -1,16 +1,5 @@
 #!/usr/bin/env groovy
 
-String call(Map config = [:]) {
-    Map defaults = [
-        dirtyFlag: '-dirty'
-    ]
-    Map runConfig = defaults + config
-
+void call() {
     checkout scm
-
-    gitTag = sh(
-        script: "git describe --tags --always --dirty=${runConfig.dirtyFlag}",
-        returnStdout: true
-      ).trim()
-    return gitTag
 }
diff --git a/vars/getCurrentTag.groovy b/vars/getCurrentTag.groovy
new file mode 100644
index 0000000..71776aa
--- /dev/null
+++ b/vars/getCurrentTag.groovy
@@ -0,0 +1,14 @@
+#!/usr/bin/env groovy
+
+String call(Map config = [:]) {
+    Map defaults = [
+        dirtyFlag: '-dirty'
+    ]
+    Map runConfig = defaults + config
+
+    gitTag = sh(
+        script: "git describe --tags --always --dirty=${runConfig.dirtyFlag}",
+        returnStdout: true
+      ).trim()
+    return gitTag
+}