Skip to content

Commit

Permalink
Stop package.json and tagging version mismatches (#6)
Browse files Browse the repository at this point in the history
* Update to stop package.json and tagging version mismatches

* Bump version to 1.0.3

* Refactor build step and apply to all build types
  • Loading branch information
KamuelaFranco authored Dec 4, 2019
1 parent 889bafe commit fe63d04
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 1 deletion.
12 changes: 12 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ defaults_Dependencies: &defaults_Dependencies |
apk --no-cache add openssh-client
apk --no-cache add bash
apk add --no-cache -t build-dependencies make gcc g++ python libtool autoconf automake
apk add --no-cache jq
npm config set unsafe-perm true
npm install -g node-gyp

Expand Down Expand Up @@ -48,6 +49,11 @@ defaults_build_docker_login: &defaults_build_docker_login
command: |
docker login -u $DOCKER_USER -p $DOCKER_PASS
defaults_check_versions: &defaults_check_versions
name: Check release tag is the same as the package version
command: |
jq -e ".version == \"${CIRCLE_TAG/v/}\"" package.json
defaults_build_docker_build: &defaults_build_docker_build
name: Build Docker image
command: |
Expand Down Expand Up @@ -310,6 +316,8 @@ jobs:
echo 'export RELEASE_TAG=$RELEASE_TAG_SNAPSHOT' >> $BASH_ENV
- run:
<<: *defaults_build_docker_login
- run:
<<: *defaults_check_versions
- run:
<<: *defaults_build_docker_build
- run:
Expand All @@ -334,6 +342,8 @@ jobs:
echo 'export RELEASE_TAG=$RELEASE_TAG_PROD' >> $BASH_ENV
- run:
<<: *defaults_build_docker_login
- run:
<<: *defaults_check_versions
- run:
<<: *defaults_build_docker_build
- run:
Expand All @@ -352,6 +362,8 @@ jobs:
echo 'export RELEASE_TAG=$RELEASE_TAG_PROD' >> $BASH_ENV
- run:
<<: *defaults_build_docker_login
- run:
<<: *defaults_check_versions
- run:
<<: *defaults_build_docker_build
- run:
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "operator-settlement",
"description": "",
"version": "1.0.2",
"version": "1.0.3",
"author": "Matt Kingston, ModusBox Inc. <[email protected]>",
"license": "Apache-2.0",
"contributors": [],
Expand Down

0 comments on commit fe63d04

Please sign in to comment.