Skip to content

Commit

Permalink
Merge pull request #71 from mocktools/develop
Browse files Browse the repository at this point in the history
Ruby SmtpMock v1.3.4
  • Loading branch information
bestwebua committed Jan 11, 2023
2 parents 6b9f231 + 04de83e commit 8aa82ea
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 2 deletions.
9 changes: 8 additions & 1 deletion .circleci/scripts/release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,14 @@ release_to_github() {
gh release create "$release_candidate_tag" --generate-notes
}

update_develop_branch() {
echo "Updating develop branch with new release tag..."
git checkout develop
git merge "$release_candidate_tag" --ff --no-edit
git push origin develop
}

if is_an_existing_github_release
then echo "Tag $release_candidate_tag already exists on GitHub. Skipping releasing flow..."
else release_to_rubygems; release_to_github
else release_to_rubygems; release_to_github; update_develop_branch
fi
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@

The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [1.3.4] - 2023-01-11

### Updated

- Updated release script

## [1.3.3] - 2023-01-10

### Added
Expand Down
2 changes: 1 addition & 1 deletion lib/smtp_mock/version.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# frozen_string_literal: true

module SmtpMock
VERSION = '1.3.3'
VERSION = '1.3.4'
end

0 comments on commit 8aa82ea

Please sign in to comment.