Skip to content

Commit f807114

Browse files
authored
Merge pull request #267 from wpengine/ryanmeier/circleci-version-parsing-update
[NO-JIRA] Update To Accommodate Prefixed Releases.
2 parents 964b3c4 + 5fc1b6d commit f807114

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

.circleci/config.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,6 @@ workflows:
193193
requires:
194194
- job_test_php56_min
195195
- job_test_php56
196-
- job_test_php56_min
197196
- job_test_php70
198197
- job_test_php71
199198
- job_test_php72
@@ -203,4 +202,4 @@ workflows:
203202
branches:
204203
ignore: /.*/
205204
tags:
206-
only: /^(\d+)\.(\d+)(\.\d+)?$/
205+
only: /^(v)?(\d+)\.(\d+)(\.\d+)?$/

.circleci/deploy.sh

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,9 @@ fi
2929

3030
SVN_DIR="/tmp/artifacts"
3131
PROJECT_DIR=$(pwd)
32+
RELEASE_TAG=$(echo $CIRCLE_TAG | sed 's/[^0-9\.]*//g')
3233

33-
echo "Preparing for version $CIRCLE_TAG release..."
34+
echo "Preparing for version $RELEASE_TAG release..."
3435

3536
# Checkout just trunk and assets for efficiency.
3637
# Tagging will be handled on the SVN level.
@@ -62,11 +63,11 @@ svn status | grep '^\!' | sed 's/! *//' | xargs -I% svn rm %@ > /dev/null
6263

6364
# Copy trunk into the current tag directory.
6465
echo "Copying tag..."
65-
svn cp "trunk" "tags/$CIRCLE_TAG"
66+
svn cp "trunk" "tags/$RELEASE_TAG"
6667

6768
svn status
6869

6970
echo "Committing files..."
70-
svn commit -m "Release version $CIRCLE_TAG." --no-auth-cache --non-interactive --username "$SVN_USERNAME" --password "$SVN_PASSWORD"
71+
svn commit -m "Release version $RELEASE_TAG." --no-auth-cache --non-interactive --username "$SVN_USERNAME" --password "$SVN_PASSWORD"
7172

72-
echo "Plugin version $CIRCLE_TAG deployed."
73+
echo "Plugin version $RELEASE_TAG deployed."

0 commit comments

Comments
 (0)