diff --git a/ci/pipelines/release.yml.erb b/ci/pipelines/release.yml.erb index 64e39db38..07aab5c95 100644 --- a/ci/pipelines/release.yml.erb +++ b/ci/pipelines/release.yml.erb @@ -27,7 +27,7 @@ resources: branch: master paths: [Dockerfile] -- name: version +- name: semver-version type: semver source: driver: git @@ -35,7 +35,7 @@ resources: 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 @@ -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 diff --git a/ci/scripts/pushscript.sh b/ci/scripts/pushscript.sh index 0a785016f..4eff2c9b7 100755 --- a/ci/scripts/pushscript.sh +++ b/ci/scripts/pushscript.sh @@ -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 diff --git a/ci/scripts/updateChangelog.sh b/ci/scripts/updateChangelog.sh index bab0a7089..7eb812d5a 100755 --- a/ci/scripts/updateChangelog.sh +++ b/ci/scripts/updateChangelog.sh @@ -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 diff --git a/ci/tasks/build-and-push-gem.yml b/ci/tasks/build-and-push-gem.yml index cfdf9b9d6..7d3877fff 100644 --- a/ci/tasks/build-and-push-gem.yml +++ b/ci/tasks/build-and-push-gem.yml @@ -2,7 +2,7 @@ platform: linux inputs: - name: lf-git -- name: version +- name: semver-version run: path: bash args: diff --git a/ci/tasks/update-changelog.yml b/ci/tasks/update-changelog.yml index 5e337ca19..b4d4c2ac4 100644 --- a/ci/tasks/update-changelog.yml +++ b/ci/tasks/update-changelog.yml @@ -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