Merge pull request #93 in STORAGEOS/c2-cli from feature/CP-4344-relea…

…se-regex to master Squashed commit of the following: commit 51916683446c15df264610508c9f19627d75ad79 Author: Dom <[email protected]> Date: Fri Jun 26 12:00:06 2020 +0100 lints: fix release branch verification regex commit 886ae51386f8b2b0ef20418d5fc0f6ad893da150 Author: Dom <[email protected]> Date: Fri Jun 26 11:42:52 2020 +0100 build: fix docker build version Stops the docker build getting a double-quoted semver.
storageos · Jun 26, 2020 · c5ec631 · c5ec631
1 parent f85b84d
commit c5ec631
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -43,7 +43,7 @@ repos:
         stages: [post-checkout]
         args: ["CP-[0-9]+"]
       - id: branch-name-check
-        args: ['^((feature|bugfix)\/|release\/v\d+\.\d+\.\d+).+']
+        args: ['^((feature|bugfix)\/|release\/v[0-9]+\.[0-9]+\.[0-9]+)']
         stages: [push]
 
   - repo: https://github.com/golangci/golangci-lint

diff --git a/Makefile b/Makefile
@@ -110,7 +110,7 @@ endif
 # environment.
 %-docker: 
 	docker run --rm \
-    -e SEMANTIC_VERSION="${SEMANTIC_VERSION}" \
+    -e SEMANTIC_VERSION=${SEMANTIC_VERSION} \
     -e GO_TEST_ARGS="${GO_TEST_ARGS}" \
     -e GO_BUILD_ARGS="${GO_BUILD_ARGS}" \
     --net="host" \