From b7ad403ca5d23c85f6813ce5f6ec56bf30c7b301 Mon Sep 17 00:00:00 2001
From: David Hoese <david.hoese@ssec.wisc.edu>
Date: Tue, 10 Nov 2020 08:58:22 -0600
Subject: [PATCH] Fix regex usage in ci rules

---
 ci_geosphere-test/gitlab-ci.yaml |  6 +++---
 ci_geosphere/gitlab-ci.yaml      | 26 +++++++++++++-------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/ci_geosphere-test/gitlab-ci.yaml b/ci_geosphere-test/gitlab-ci.yaml
index 052db5e..3b60262 100644
--- a/ci_geosphere-test/gitlab-ci.yaml
+++ b/ci_geosphere-test/gitlab-ci.yaml
@@ -43,7 +43,7 @@ gstest deploy rabbit:
   # this job doesn't actually need any artifacts from previous jobs
   dependencies: []
   rules:
-    - if: $CI_COMMIT_TAG !~ $GEOSPHERE_TEST_TAG_REGEX
+    - if: $CI_COMMIT_TAG !~ /$GEOSPHERE_TEST_TAG_REGEX/
       when: never
     # no need to build if another project triggered us
     - if: $CI_PIPELINE_SOURCE == "pipeline"
@@ -122,7 +122,7 @@ gstest deploy mapcache:
     VALUES_DIR: "ci_geosphere-test"
   extends: .deploy_mapcache
   rules:
-    - if: $CI_COMMIT_TAG !~ $GEOSPHERE_TEST_TAG_REGEX
+    - if: $CI_COMMIT_TAG !~ /$GEOSPHERE_TEST_TAG_REGEX/
       when: never
     - when: on_success
 
@@ -147,7 +147,7 @@ gstest deploy client:
   dependencies:
     - get_chart_client_test
   rules:
-    - if: $CI_COMMIT_TAG !~ $GEOSPHERE_TEST_TAG_REGEX
+    - if: $CI_COMMIT_TAG !~ /$GEOSPHERE_TEST_TAG_REGEX/
       when: never
     - when: on_success
 
diff --git a/ci_geosphere/gitlab-ci.yaml b/ci_geosphere/gitlab-ci.yaml
index 5057681..3d293a1 100644
--- a/ci_geosphere/gitlab-ci.yaml
+++ b/ci_geosphere/gitlab-ci.yaml
@@ -19,7 +19,7 @@ gs create geotiff storage:
   # this job doesn't actually need any artifacts from previous jobs
   dependencies: []
   rules:
-    - if: $CI_COMMIT_TAG !~ $GEOSPHERE_TAG_REGEX
+    - if: $CI_COMMIT_TAG !~ /$GEOSPHERE_TAG_REGEX/
       when: never
     - if: $CREATE_STORAGE
 
@@ -35,7 +35,7 @@ gs create shapefile storage:
   # this job doesn't actually need any artifacts from previous jobs
   dependencies: []
   rules:
-    - if: $CI_COMMIT_TAG !~ $GEOSPHERE_TAG_REGEX
+    - if: $CI_COMMIT_TAG !~ /$GEOSPHERE_TAG_REGEX/
       when: never
     # this will always be true for tags
     - changes:
@@ -57,7 +57,7 @@ gs deploy rabbit:
   # this job doesn't actually need any artifacts from previous jobs
   dependencies: []
   rules:
-    - if: $CI_COMMIT_TAG !~ $GEOSPHERE_TAG_REGEX
+    - if: $CI_COMMIT_TAG !~ /$GEOSPHERE_TAG_REGEX/
       when: never
     # no need to build if another project triggered us
     - if: $CI_PIPELINE_SOURCE == "pipeline"
@@ -87,7 +87,7 @@ gs deploy g16 grb:
   dependencies:
     - get_chart_grb
   rules:
-    - if: $CI_COMMIT_TAG !~ $GEOSPHERE_TAG_REGEX
+    - if: $CI_COMMIT_TAG !~ /$GEOSPHERE_TAG_REGEX/
       when: never
     - when: on_success
 
@@ -97,7 +97,7 @@ gs deploy geo2grid g16 radf:
     VALUES_DIR: "ci_geosphere"
     DEPLOY_SUFFIX: "-g16-radf"
   rules:
-    - if: '$CI_COMMIT_TAG !~ /$GEOSPHERE_TAG_REGEX/'
+    - if: $CI_COMMIT_TAG !~ /$GEOSPHERE_TAG_REGEX/
       when: never
     - when: on_success
 
@@ -107,7 +107,7 @@ gs deploy geo2grid g16 radc:
     VALUES_DIR: "ci_geosphere"
     DEPLOY_SUFFIX: "-g16-radc"
   rules:
-    - if: '$CI_COMMIT_TAG !~ $GEOSPHERE_TAG_REGEX'
+    - if: $CI_COMMIT_TAG !~ /$GEOSPHERE_TAG_REGEX/
       when: never
     - when: on_success
 
@@ -137,7 +137,7 @@ gs deploy tile gen g16 radf:
     VALUES_DIR: "ci_geosphere"
     DEPLOY_SUFFIX: "-g16-radf"
   rules:
-    - if: $CI_COMMIT_TAG !~ $GEOSPHERE_TAG_REGEX
+    - if: $CI_COMMIT_TAG !~ /$GEOSPHERE_TAG_REGEX/
       when: never
     - when: on_success
 
@@ -147,7 +147,7 @@ gs deploy tile gen g16 radc:
     VALUES_DIR: "ci_geosphere"
     DEPLOY_SUFFIX: "-g16-radc"
   rules:
-    - if: $CI_COMMIT_TAG !~ $GEOSPHERE_TAG_REGEX
+    - if: $CI_COMMIT_TAG !~ /$GEOSPHERE_TAG_REGEX/
       when: never
     - when: on_success
 
@@ -157,7 +157,7 @@ gs deploy_tile_gen_g16_radm1:
     VALUES_DIR: "ci_geosphere"
     DEPLOY_SUFFIX: "-g16-radm1"
   rules:
-    - if: $CI_COMMIT_TAG !~ $GEOSPHERE_TAG_REGEX
+    - if: $CI_COMMIT_TAG !~ /$GEOSPHERE_TAG_REGEX/
       when: never
     - when: on_success
 
@@ -167,7 +167,7 @@ gs deploy_tile_gen_g16_radm2:
     VALUES_DIR: "ci_geosphere"
     DEPLOY_SUFFIX: "-g16-radm2"
   rules:
-    - if: $CI_COMMIT_TAG !~ $GEOSPHERE_TAG_REGEX
+    - if: $CI_COMMIT_TAG !~ /$GEOSPHERE_TAG_REGEX/
       when: never
     - when: on_success
 
@@ -179,7 +179,7 @@ gs deploy mapserver:
     VALUES_DIR: "ci_geosphere"
   extends: .deploy_mapserver
   rules:
-    - if: $CI_COMMIT_TAG !~ $GEOSPHERE_TAG_REGEX
+    - if: $CI_COMMIT_TAG !~ /$GEOSPHERE_TAG_REGEX/
       when: never
     - when: on_success
 
@@ -191,7 +191,7 @@ gs deploy mapcache:
     VALUES_DIR: "ci_geosphere"
   extends: .deploy_mapcache
   rules:
-    - if: $CI_COMMIT_TAG !~ $GEOSPHERE_TAG_REGEX
+    - if: $CI_COMMIT_TAG !~ /$GEOSPHERE_TAG_REGEX/
       when: never
     - when: on_success
 
@@ -216,6 +216,6 @@ gs deploy client:
   dependencies:
     - get_chart_client
   rules:
-    - if: $CI_COMMIT_TAG !~ $GEOSPHERE_TAG_REGEX
+    - if: $CI_COMMIT_TAG !~ /$GEOSPHERE_TAG_REGEX/
       when: never
     - when: on_success
-- 
GitLab