Skip to content

Commit

Permalink
Fix version names
Browse files Browse the repository at this point in the history
Signed-off-by: Shane Lattanzio <[email protected]>
  • Loading branch information
JennyYJK authored and xtreme-shane-lattanzio committed Mar 1, 2019
1 parent 7aaae83 commit 5d96480
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 10 deletions.
12 changes: 6 additions & 6 deletions ci/pipelines/release.yml.erb
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@ resources:
branch: master
paths: [Dockerfile]

- name: version
- name: semver-version
type: semver
source:
driver: git
uri: [email protected]:pivotal-legacy/LicenseFinder.git
branch: master
file: VERSION
private_key: ((CfOslBot.private_key))
commit_message: "Updates version to: %version"
commit_message: "Updates version to: %version%"

- name: dockerhub-edge
type: docker-image
Expand Down Expand Up @@ -124,27 +124,27 @@ jobs:
plan:
- get: lf-git
passed: [<%= ruby_versions.map{ |version| "ruby-#{version}"}.join(', ') %>]
- put: version
- put: semver-version
params: {bump: major}

- name: bump-minor
plan:
- get: lf-git
passed: [<%= ruby_versions.map{ |version| "ruby-#{version}"}.join(', ') %>]
- put: version
- put: semver-version
params: {bump: minor}

- name: bump-patch
plan:
- get: lf-git
passed: [<%= ruby_versions.map{ |version| "ruby-#{version}"}.join(', ') %>]
- put: version
- put: semver-version
params: {bump: patch}

- name: release
plan:
- get: lf-git
- get: version
- get: semver-version
trigger: true
passed: [bump-major, bump-minor, bump-patch]
- get: dockerhub
Expand Down
2 changes: 1 addition & 1 deletion ci/scripts/pushscript.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ echo -e "---\n:rubygems_api_key: $GEM_API_KEY" > ~/.gem/credentials
chmod 0600 ~/.gem/credentials

cd lf-git
build_version="$(cat version/version)"
build_version="$(cat semver-version/version)"
built_gem="pkg/license_finder-$build_version.gem"

git config --global user.email $GIT_EMAIL
Expand Down
2 changes: 1 addition & 1 deletion ci/scripts/updateChangelog.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ TAGS=( "Added" "ADDED" "Fixed" "FIXED" "Changed" "CHANGED" "Deprecated" "DEPRECA
CONTRIBUTORS=( "Shane Lattanzio" "Li Tai" "Vikram Yadav" "Mark Fiorvanti" "Serafima Ostrovskaya" "Yoon Jean Kim" "Tony Wong" "Parv Mital" )

OLD="v$(cat ./lf-release/version)"
VERSION="$(cat version/version)"
VERSION="$(cat semver-version/version)"
VERSION_TAG="v$VERSION"

# Add version title information
Expand Down
2 changes: 1 addition & 1 deletion ci/tasks/build-and-push-gem.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
platform: linux
inputs:
- name: lf-git
- name: version
- name: semver-version
run:
path: bash
args:
Expand Down
3 changes: 2 additions & 1 deletion ci/tasks/update-changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@ platform: linux
inputs:
- name: lf-git
- name: lf-release
- name: version
- name: semver-version
outputs:
- name: lf-git-changed
- name: version
run:
path: lf-git/ci/scripts/updateChangelog.sh

0 comments on commit 5d96480

Please sign in to comment.