[trafficcontrol] branch master updated: Do not pick up release candidate tags when running `git describe` (#5973)

[oc...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ocket8888 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git


The following commit(s) were added to refs/heads/master by this push:
     new dddcdd1  Do not pick up release candidate tags when running `git describe` (#5973)
dddcdd1 is described below

commit dddcdd1e3d626d96762afa893e420128178c3b54
Author: Zach Hoffman <zr...@apache.org>
AuthorDate: Thu Jun 24 13:19:20 2021 -0600

    Do not pick up release candidate tags when running `git describe` (#5973)
    
    * Do not pick up release candidate tags when running `git describe`
    
    * Trigger the CDN-in-a-Box CI workflow when the ATS RPM configuration is changed
---
 .github/workflows/ciab.yaml                                  | 4 ++++
 cache-config/testing/docker/trafficserver/trafficserver.spec | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ciab.yaml b/.github/workflows/ciab.yaml
index c4f3eba..05989d3 100644
--- a/.github/workflows/ciab.yaml
+++ b/.github/workflows/ciab.yaml
@@ -30,6 +30,8 @@ on:
       - '**/*.md'
       - '**/test/**'
       - 'blueprints/**'
+      - '!cache-config/testing/docker/docker-compose-ats-build.yml'
+      - '!cache-config/testing/docker/trafficserver/**'
       - 'docs/**'
       - 'experimental/**'
       - '.github/**'
@@ -54,6 +56,8 @@ on:
       - '**/*.md'
       - '**/test/**'
       - 'blueprints/**'
+      - '!cache-config/testing/docker/docker-compose-ats-build.yml'
+      - '!cache-config/testing/docker/trafficserver/**'
       - 'docs/**'
       - 'experimental/**'
       - '.github/**'
diff --git a/cache-config/testing/docker/trafficserver/trafficserver.spec b/cache-config/testing/docker/trafficserver/trafficserver.spec
index 12a0b72..b793d18 100644
--- a/cache-config/testing/docker/trafficserver/trafficserver.spec
+++ b/cache-config/testing/docker/trafficserver/trafficserver.spec
@@ -20,9 +20,9 @@
 
 %global src %{_topdir}/SOURCES/trafficserver
 %global git_args --git-dir="%{src}/.git" --work-tree="%{src}"
-%global tag %(git %{git_args} describe --long |      sed 's/^\\\(.*\\\)-\\\([0-9]\\\+\\\)-g\\\([0-9a-f]\\\+\\\)$/\\\1/' | sed 's/-/_/')
-%global distance %(git %{git_args} describe --long | sed 's/^\\\(.*\\\)-\\\([0-9]\\\+\\\)-g\\\([0-9a-f]\\\+\\\)$/\\\2/')
-%global commit %(git %{git_args} describe --long |   sed 's/^\\\(.*\\\)-\\\([0-9]\\\+\\\)-g\\\([0-9a-f]\\\+\\\)$/\\\3/')
+%global tag %(git %{git_args} describe --long '--exclude=*.*.*-rc*' |      sed 's/^\\\(.*\\\)-\\\([0-9]\\\+\\\)-g\\\([0-9a-f]\\\+\\\)$/\\\1/' | sed 's/-/_/')
+%global distance %(git %{git_args} describe --long '--exclude=*.*.*-rc*' | sed 's/^\\\(.*\\\)-\\\([0-9]\\\+\\\)-g\\\([0-9a-f]\\\+\\\)$/\\\2/')
+%global commit %(git %{git_args} describe --long '--exclude=*.*.*-rc*' |   sed 's/^\\\(.*\\\)-\\\([0-9]\\\+\\\)-g\\\([0-9a-f]\\\+\\\)$/\\\3/')
 %global git_serial %(git %{git_args} rev-list HEAD | wc -l)
 %global install_prefix "/opt"
 %global api_stats "4096"