Skip to content

Commit 8aa82ea

Browse files
authored
Merge pull request #71 from mocktools/develop
Ruby SmtpMock v1.3.4
2 parents 6b9f231 + 04de83e commit 8aa82ea

3 files changed

Lines changed: 15 additions & 2 deletions

File tree

.circleci/scripts/release.sh

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,14 @@ release_to_github() {
5656
gh release create "$release_candidate_tag" --generate-notes
5757
}
5858

59+
update_develop_branch() {
60+
echo "Updating develop branch with new release tag..."
61+
git checkout develop
62+
git merge "$release_candidate_tag" --ff --no-edit
63+
git push origin develop
64+
}
65+
5966
if is_an_existing_github_release
6067
then echo "Tag $release_candidate_tag already exists on GitHub. Skipping releasing flow..."
61-
else release_to_rubygems; release_to_github
68+
else release_to_rubygems; release_to_github; update_develop_branch
6269
fi

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22

33
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).
44

5+
## [1.3.4] - 2023-01-11
6+
7+
### Updated
8+
9+
- Updated release script
10+
511
## [1.3.3] - 2023-01-10
612

713
### Added

lib/smtp_mock/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# frozen_string_literal: true
22

33
module SmtpMock
4-
VERSION = '1.3.3'
4+
VERSION = '1.3.4'
55
end

0 commit comments

Comments
 (0)